2024-07-05 修改

1. 部分UI逻辑代码修改

.idea/deploymentTargetDropDown.xml

@@ -6,7 +6,20 @@
         <State />
       </entry>
       <entry key="app">
-        <State />
+        <State>
+          <runningDeviceTargetSelectedWithDropDown>
+            <Target>
+              <type value="RUNNING_DEVICE_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="SERIAL_NUMBER" />
+                  <value value="3bb3c424" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </runningDeviceTargetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-07-11T08:07:17.966626Z" />
+        </State>
       </entry>
     </value>
   </component>

.idea/dictionaries/PC.xml

@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="PC" />
+</component>

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.pan_american.android"
         minSdk 24
         targetSdk 33
-        versionCode 4
+        versionCode 5
-        versionName "1.0.3"
+        versionName "1.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/pan_american/android/ui/announcement/AnnouncementFragment.kt

@@ -59,8 +59,8 @@ class AnnouncementFragment : BaseFragment<FragmentAnnouncementBinding>() {
         bundle: Bundle?
     ) = FragmentAnnouncementBinding.inflate(inflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         if (listInit) {
             if (isUnRead) {

app/src/main/java/com/pan_american/android/ui/customer_resource/company_customer/CustomerSiftFragment.kt

@@ -84,8 +84,8 @@ class CustomerSiftFragment : BaseFragment<FragmentCustomerFilterBinding>() {
         initDepartNumber()
     }
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().getString("business")?.apply {
             if (isNotBlank()) {
@@ -117,8 +117,6 @@ class CustomerSiftFragment : BaseFragment<FragmentCustomerFilterBinding>() {
             }
         }
 
-
-
         range = requireArguments().getInt("range")
     }
 

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.customer_resource.market_sales_revenue
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
@@ -51,8 +52,8 @@ class SalesRevenueListFragment : BaseFragment<FragmentSalesRevenueListBinding>()
         bundle: Bundle?
     ) = FragmentSalesRevenueListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         if (isInit) {
             val calendar = Calendar.getInstance()

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

@@ -2,6 +2,7 @@ package com.pan_american.android.ui.customer_resource.market_sales_revenue
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
@@ -40,8 +41,8 @@ class SalesRevenueRankFragment : BaseFragment<FragmentSalesRevenueRankBinding>()
         bundle: Bundle?
     ) = FragmentSalesRevenueRankBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         if (isInit) {
             val calendar = Calendar.getInstance()

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

@@ -84,8 +84,8 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
         bundle: Bundle?
     ) = FragmentSalesRevenueTotalBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         if (isInit) {
 
@@ -193,26 +193,24 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
 
     override fun initViews() {
         //二次验证
-//        var haveAuthorization = false
+        var haveAuthorization = false
-//
+
-//        for (item in OASystem.marketSalesRevenueUserList) {
+        for (item in OASystem.marketSalesRevenueUserList) {
-//            if (OASystem.userInfo.userId == item.id) {
+            if (OASystem.userInfo.userId == item.id) {
-//                haveAuthorization = true
+                haveAuthorization = true
-//            }
+            }
-//        }
+        }
-//
+
-//        if (haveAuthorization) {
+        if (haveAuthorization) {
-//            getYearSalesStatistics()
+            getYearSalesStatistics()
-//        } else {
+        } else {
-//            showMessage(resources.getString(R.string.permission_denied))
+            showMessage(resources.getString(R.string.permission_denied))
-//        }
+        }
 
         if (OASystem.userInfo.userId == 258 || OASystem.userInfo.userId == 21) {
             binding.siftMenu.visibility = View.VISIBLE
         }
 
-        getYearSalesStatistics()
-
     }
 
     override fun initEvents() {
@@ -723,9 +721,9 @@ class SalesRevenueTotalFragment : BaseFragment<FragmentSalesRevenueTotalBinding>
                             //在Y轴的动画  参数是动画执行时间 毫秒为单位
                             animateY(1000)
                             //X轴动画
-                            //line.animateX(2000);
+                            //line.animateX(2000)
                             //XY两轴混合动画
-                            //line.animateXY(2000,2000);
+                            //line.animateXY(2000,2000)
 
                             //设置不可手动旋转
                             isRotationEnabled = false

app/src/main/java/com/pan_american/android/ui/customer_resource/related_invitee/RelatedInviteeListFragment.kt

@@ -57,10 +57,6 @@ class RelatedInviteeListFragment : BaseFragment<FragmentRelatedInviteeListBindin
             relatedInviteeListRequest.teamName = getString("group_name", "")
             relatedInviteeListRequest.unitName = getString("invitee_name", "")
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
 
         relatedInviteeListRequest.pageIndex = pageIndex
         relatedInviteeListRequest.pageSize = 10
@@ -176,6 +172,7 @@ class RelatedInviteeListFragment : BaseFragment<FragmentRelatedInviteeListBindin
                         isShowXSequence = false
                         isShowYSequence = false
                         verticalPadding = resources.getDimensionPixelSize(R.dimen.common_padding)
+                        minTableWidth = relatedInviteeTable.width
 //                        columnTitleStyle = FontStyle(resources.getDimensionPixelSize(R.dimen.text_size_large), ResourcesCompat.getColor(resources, R.color.text_color, null))
 //                        contentStyle = FontStyle(resources.getDimensionPixelSize(R.dimen.text_size_medium), ResourcesCompat.getColor(resources, R.color.text_color, null))
                     }

app/src/main/java/com/pan_american/android/ui/customer_resource/related_invitee/RelatedInviteeSearchFragment.kt

@@ -65,10 +65,6 @@ class RelatedInviteeSearchFragment : BaseFragment<FragmentRelatedInviteeSearchBi
         super.onViewCreated(view, savedInstanceState)
 
         binding.commit.setText(resources.getString(R.string.search))
-    }
-
-    override fun onStart() {
-        super.onStart()
 
         initEvents()
     }

app/src/main/java/com/pan_american/android/ui/document/DocumentFragment.kt

@@ -18,8 +18,8 @@ class DocumentFragment : BaseFragment<FragmentDocumentBinding>(), OnClickListene
         bundle: Bundle?
     ) = FragmentDocumentBinding.inflate(inflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initEvents()
     }

app/src/main/java/com/pan_american/android/ui/efficiency_tools/address_book/CompanyListFragment.kt

@@ -2,6 +2,7 @@ package com.pan_american.android.ui.efficiency_tools.address_book
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -30,8 +31,8 @@ class CompanyListFragment : BaseFragment<FragmentCompanyListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentCompanyListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
     }

app/src/main/java/com/pan_american/android/ui/efficiency_tools/address_book/DepartmentListFragment.kt

@@ -2,6 +2,7 @@ package com.pan_american.android.ui.efficiency_tools.address_book
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -33,8 +34,8 @@ class DepartmentListFragment : BaseFragment<FragmentDepartmentListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentDepartmentListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             companyId = getInt("companyId")

app/src/main/java/com/pan_american/android/ui/efficiency_tools/address_book/MemberListFragment.kt

@@ -2,6 +2,7 @@ package com.pan_american.android.ui.efficiency_tools.address_book
 
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -38,8 +39,8 @@ class MemberListFragment : BaseFragment<FragmentMemberListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentMemberListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             companyId = getInt("companyId")

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

@@ -57,8 +57,8 @@ class AirplaneTicketListFragment : BaseFragment<FragmentAirplaneTicketListBindin
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentAirplaneTicketListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -53,8 +53,8 @@ class InsuranceListFragment : BaseFragment<FragmentInsuranceListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentInsuranceListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -302,7 +302,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
     private fun canBeEdit(): Boolean {
         return if (fromList) {
-            OASystem.authorization(OASystem.HOTEL_PREDETERMINE, OASystem.EDIT) and  (isAuditGM != 1)
+            OASystem.authorization(OASystem.HOTEL_PREDETERMINE, OASystem.EDIT) and (isAuditGM != 1)
         } else {
             true
         }
@@ -345,6 +345,9 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                         OASystem.needRefresh = true
 
                         finish()
+
+
+
                     } else {
                         showMessage(updateResponse.msg)
                     }

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

@@ -59,8 +59,8 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
         bundle: Bundle?
     ) = FragmentHotelPredetermineBaseBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             fromList = getBoolean("fromList")
@@ -176,7 +176,7 @@ class HotelPredetermineBaseFragment : BaseFragment<FragmentHotelPredetermineBase
                 binding.apply {
                     customerType.isEnabled = false
                     predetermineWebsite.isEnabled = false
-                    hotelConfirmCode.isEnabled = false
+                    hotelConfirmCode.isEnabled(false)
                     locatedCity.isEnabled = false
                     hotelName.isEnabled = false
                     hotelTel.isEnabled = false

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

@@ -47,8 +47,8 @@ class HotelPredetermineListFragment : BaseFragment<FragmentHotelPredetermineList
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentHotelPredetermineListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -61,10 +61,6 @@ class InviteDataListFragment : BaseFragment<FragmentInviteDataListBinding>() {
             inviteDataListRequest.startCreateTime = getString("startCreateTime", "")
             inviteDataListRequest.endCreateTime = getString("endCreateTime", "")
         }
-    }
-
-    override fun onStart() {
-        super.onStart()
 
         inviteDataListRequest.pageIndex = pageIndex
         inviteDataListRequest.pageSize = 10

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

@@ -74,15 +74,33 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
         bundle: Bundle?
     ) = FragmentInviteDataSearchBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        getInviteDataResource()
+    }
+
     override fun onStart() {
         super.onStart()
 
-        if (!dataInit) {
+        initViews()
-            getInviteDataResource()
+    }
-        } else {
+
-            initEvents()
+    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
@@ -101,21 +119,6 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
 
             inStuck = false
         }
-
-    }
-
-    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() {

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

@@ -53,8 +53,8 @@ class GroupInvitePaymentListFragment : BaseFragment<FragmentGroupInvitePaymentLi
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInvitePaymentListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -34,8 +34,8 @@ class GroupCustomerDetailFragment : BaseFragment<FragmentGroupCustomerDetailBind
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupCustomerDetailBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             position = getInt("position")

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

@@ -26,15 +26,19 @@ class GroupCustomerListFragment : BaseFragment<FragmentGroupCustomerListBinding>
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupCustomerListBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initViews()
+        initEvents()
+    }
+
     override fun onStart() {
         super.onStart()
 
         if (!EventBus.getDefault().isRegistered(this)) {
             EventBus.getDefault().register(this)
         }
-
-        initViews()
-        initEvents()
     }
 
     override fun onStop() {

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

@@ -27,8 +27,8 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoBaseBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
         initEvents()

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

@@ -16,8 +16,8 @@ class GroupInfoExaminationFragment : BaseFragment<FragmentGroupInfoExaminationBi
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoExaminationBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
         initEvents()

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.group_management.group_info
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.pan_american.android.OASystem
@@ -46,8 +47,8 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupInfoListRequest.apply {

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

@@ -15,8 +15,8 @@ class GroupInfoRequireFragment : BaseFragment<FragmentGroupInfoRequireBinding>()
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoRequireBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
         initEvents()

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.group_management.group_info
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
@@ -37,8 +38,8 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoSearchBinding.inflate(layoutInflater, container, false)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+        super.onViewCreated(view, savedInstanceState)
 
         //准备groupTypeList
         groupTypeList.add(Selector().apply {
@@ -49,13 +50,14 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
         for (item in OASystem.groupInfoGroupType) {
             groupTypeList.add(item)
         }
+
+        initEvents()
     }
 
     override fun onStart() {
         super.onStart()
 
         initViews()
-        initEvents()
     }
 
     override fun onStop() {

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

@@ -51,8 +51,8 @@ class GroundConveyPaymentListFragment : BaseFragment<FragmentGroupOpPaymentListB
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupOpPaymentListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -51,8 +52,8 @@ class GroupSimpleInfoFragment : BaseFragment<FragmentSimpleGroupBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentSimpleGroupBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             id = getInt("id")

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

@@ -53,8 +53,8 @@ class VisaPaymentListFragment : BaseFragment<FragmentVisaPaymentListBinding>() {
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentVisaPaymentListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             groupId = getInt("groupId")

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.resource_management.airplane_three_code
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -45,8 +46,8 @@ class AirplaneThreeCodeListFragment : BaseFragment<FragmentAirplaneThreeCodeList
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentAirplaneThreeCodeListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         airplaneThreeCodeRequest = AirplaneThreeCodeRequest(
             requireArguments().getString("airplane_city").toString(),

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

@@ -46,14 +46,16 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentAirplaneThreeCodeSearchBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initAreaSelector()
+    }
+
     override fun onStart() {
         super.onStart()
 
-        initAreaSelector()
         initViews()
-        if (listInit) {
-            initEvents()
-        }
     }
 
     override fun onStop() {

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.resource_management.car_resource
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -46,8 +47,8 @@ class CarResourceListFragment : BaseFragment<FragmentCarResourceListBinding>() {
     ) = FragmentCarResourceListBinding.inflate(layoutInflater, container, false)
 
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             carResourceRequest = ResourceRequest(

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

@@ -50,14 +50,16 @@ class CarResourceSearchFragment : BaseFragment<FragmentCarResourceSearchBinding>
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentCarResourceSearchBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initAreaSelector()
+    }
+
     override fun onStart() {
         super.onStart()
 
-        initAreaSelector()
         initViews()
-        if (listInit) {
-            initEvents()
-        }
     }
 
     override fun onStop() {

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.resource_management.guide_resource
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -45,8 +46,8 @@ class GuideResourceListFragment : BaseFragment<FragmentGuideResourceListBinding>
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGuideResourceListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             guideResourceRequest = ResourceRequest(

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

@@ -50,15 +50,16 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGuideResourceSearchBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initAreaSelector()
+    }
+
     override fun onStart() {
         super.onStart()
 
-        initAreaSelector()
         initViews()
-
-        if (listInit) {
-            initEvents()
-        }
     }
 
     override fun onStop() {

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

@@ -3,6 +3,7 @@ package com.pan_american.android.ui.resource_management.hotel_resource
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -45,8 +46,8 @@ class HotelResourceListFragment : BaseFragment<FragmentHotelResourceListBinding>
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentHotelResourceListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         requireArguments().apply {
             hotelResourceListRequest = HotelResourceListRequest(

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

@@ -50,15 +50,16 @@ class HotelResourceSearchFragment : BaseFragment<FragmentHotelResourceSearchBind
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentHotelResourceSearchBinding.inflate(layoutInflater, container, false)
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initAreaSelector()
+    }
+
     override fun onStart() {
         super.onStart()
 
-        initAreaSelector()
         initViews()
-
-        if (listInit) {
-            initEvents()
-        }
     }
 
     override fun onStop() {

app/src/main/java/com/pan_american/android/ui/resource_management/service_resource/ServiceResourceListFragment.kt

@@ -3,12 +3,13 @@ package com.pan_american.android.ui.resource_management.service_resource
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.pan_american.android.OASystem
 import com.pan_american.android.base.BaseFragment
-import com.pan_american.android.data.model.common.entity.ServiceResourceListItem
 import com.pan_american.android.data.model.common.adapter.ServiceResourceAdapter
+import com.pan_american.android.data.model.common.entity.ServiceResourceListItem
 import com.pan_american.android.databinding.FragmentServiceResourceListBinding
 
 class ServiceResourceListFragment : BaseFragment<FragmentServiceResourceListBinding>() {
@@ -19,8 +20,8 @@ class ServiceResourceListFragment : BaseFragment<FragmentServiceResourceListBind
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentServiceResourceListBinding.inflate(layoutInflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
     }

app/src/main/java/com/pan_american/android/ui/workspace/WorkspaceFragment.kt

@@ -36,8 +36,8 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentWorkspaceBinding.inflate(inflater, container, false)
 
-    override fun onStart() {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onStart()
+        super.onViewCreated(view, savedInstanceState)
 
         initViews()
         initEvents()

app/src/main/res/values/strings.xml

@@ -166,7 +166,7 @@
     <string name="exchange_tool">汇率换算</string>
 
     <string name="group_hotel">团组酒店</string>
-    <string name="hotel_predetermine">酒店预定</string>
+    <string name="hotel_predetermine">酒店预订</string>
 
     <string name="group_op">团组OP</string>
     <string name="ground_convey_payment_insert">地接费用录入</string>
@@ -749,8 +749,8 @@
     <!-- 酒店费用录入 -->
     <string name="hotel_payment_list">酒店费用列表</string>
 
-    <!-- 酒店预定列表，错误信息 -->
+    <!-- 酒店预订列表，错误信息 -->
-    <string name="hotel_predetermine_list_get_failed">酒店预定费用列表获取失败</string>
+    <string name="hotel_predetermine_list_get_failed">酒店预订费用列表获取失败</string>
 
     <string name="hotel_payment_detail">酒店费用详情</string>
 
@@ -758,7 +758,7 @@
     <string name="currency_not_set_hint">当前团组未设置此币种汇率，请前往WEB端设置或联系财务部门</string>
     <string name="check_in_ticket_number">入住卷号码</string>
     <string name="wait_to_create">添加数据自动生成</string>
-    <string name="predetermine_website">预定网站</string>
+    <string name="predetermine_website">预订网站</string>
     <string name="hotel_confirm_code">酒店确认码</string>
     <string name="predetermine_code">预订号码</string>
     <string name="located_city">所在城市</string>
@@ -771,7 +771,7 @@
 
     <string name="room_numbers">间</string>
 
-    <string name="hotel_predetermine_sub_payment">酒店预定子款项</string>
+    <string name="hotel_predetermine_sub_payment">酒店预订子款项</string>
 
     <string name="reality_single_room">实际单间数量</string>
     <string name="single_room_price">单间价格</string>
@@ -794,8 +794,8 @@
     <string name="room_introduction">房间说明</string>
 
     <string name="bank_card_select_hint">请选择银行卡</string>
-    <string name="website_select_hint">请选择预定网站</string>
+    <string name="website_select_hint">请选择预订网站</string>
-    <string name="predetermine_code_hint">请输入预定号码</string>
+    <string name="predetermine_code_hint">请输入预订号码</string>
     <string name="hotel_confirm_code_hint">请输入酒店确定号码</string>
     <string name="hotel_located_input_hint">请输入酒店所在城市</string>
     <string name="hotel_name_input_hint">请输入酒店名称</string>