2024-04-25 修改

修改:

1. 修改工作台模块名称和模块所属，保持与web端尽量一致

app/src/main/java/com/pan_american/android/OASystem.kt

@@ -153,7 +153,7 @@ class OASystem : Application() {
 //        const val GROUP_INFORMATION = 26
 
         //团组操作
-        const val GROUP_OPERATION = 27
+        const val GROUP_INFORMATION = 27
 
         //酒店预定
         const val HOTEL_PREDETERMINE = 28

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

@@ -16,7 +16,7 @@ class GroupInfoSimpleAdapter(private val groupInfoList: ArrayList<GroupInfoSimpl
     lateinit var onRecyclerViewItemClick: OnRecyclerViewItemClick<GroupInfoSimple>
 
     //是否有删除权限
-    private var canDelete = OASystem.authorization(OASystem.GROUP_OPERATION, OASystem.DELETE)
+    private var canDelete = OASystem.authorization(OASystem.GROUP_INFORMATION, OASystem.DELETE)
 
     inner class ViewHolder(view: View): RecyclerView.ViewHolder(view) {
         val groupName: TextView = view.findViewById(R.id.group_name)

app/src/main/java/com/pan_american/android/data/model/group_management/group_info/network/GroupInfoListRequest.kt

@@ -6,7 +6,7 @@ import com.pan_american.android.base.BaseRequest
 class GroupInfoListRequest: BaseRequest() {
 
     val userId = OASystem.userInfo.userId
-    val pageId = OASystem.GROUP_OPERATION
+    val pageId = OASystem.GROUP_INFORMATION
 
     var teamDid = 0
     var isSure = 0

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

@@ -191,7 +191,7 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
             if (fromList) {
                 titleText.text = resources.getString(R.string.hotel_payment_detail)
             } else {
-                titleText.text = resources.getString(R.string.hotel_payment_insert)
+                titleText.text = resources.getString(R.string.hotel_predetermine)
                 binding.commit.text = resources.getString(R.string.add)
             }
 

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

@@ -23,7 +23,7 @@ class HotelPredetermineActivity : BaseActivity<ActivityHotelPredetermineBinding>
 
     override fun initViews() {
         titleBinding = LayoutTitleBinding.bind(binding.root).apply {
-            titleText.text = resources.getString(R.string.hotel_payment_insert)
+            titleText.text = resources.getString(R.string.hotel_predetermine)
         }
 
         val bundle = Bundle().apply {

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

@@ -34,9 +34,9 @@ class GroupInfoActivity : BaseActivity<ActivityGroupInfoBinding>() {
 
     override fun initTitle() {
         titleBinding = LayoutTitleBinding.bind(binding.root).apply {
-            titleText.text = resources.getString(R.string.pick_up_group_info)
+            titleText.text = resources.getString(R.string.group_operation)
 
-            if (OASystem.authorization(OASystem.GROUP_OPERATION, OASystem.ADD)) {
+            if (OASystem.authorization(OASystem.GROUP_INFORMATION, OASystem.ADD)) {
                 addButton.apply {
 
                     visibility = View.VISIBLE

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

@@ -80,7 +80,7 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             levelIllustrate.text = OASystem.groupOperationRequest.opRoyaltyRemark
         }
 
-        if (!OASystem.authorization(OASystem.GROUP_OPERATION, OASystem.EDIT)) {
+        if (!OASystem.authorization(OASystem.GROUP_INFORMATION, OASystem.EDIT)) {
             binding.apply {
 
                 salesQuotation.isEnabled = false

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

@@ -55,7 +55,7 @@ class GroupInfoExaminationFragment : BaseFragment<FragmentGroupInfoExaminationBi
             politicalCheckCode.setText(OASystem.groupOperationRequest.zzscspwh)
         }
 
-        if (!OASystem.authorization(OASystem.GROUP_OPERATION, OASystem.EDIT)) {
+        if (!OASystem.authorization(OASystem.GROUP_INFORMATION, OASystem.EDIT)) {
             binding.apply {
                 departmentName.isEnabled = false
                 examinationCode.isEnabled = false

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

@@ -210,7 +210,7 @@ class GroupInfoListFragment : BaseFragment<FragmentGroupInfoListBinding>() {
                             }
                             setPositiveButtonAndListener(resources.getString(R.string.confirm)) { _, _ ->
                                 if (OASystem.authorization(
-                                        OASystem.GROUP_OPERATION, OASystem.PROCESS
+                                        OASystem.GROUP_INFORMATION, OASystem.PROCESS
                                     )
                                 ) {
                                     groupStatusChange(position)

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

@@ -34,7 +34,7 @@ class GroupInfoRequireFragment : BaseFragment<FragmentGroupInfoRequireBinding>()
             wechat.setText(OASystem.groupOperationRequest.weChatNo)
         }
 
-        if (!OASystem.authorization(OASystem.GROUP_OPERATION, OASystem.EDIT)) {
+        if (!OASystem.authorization(OASystem.GROUP_INFORMATION, OASystem.EDIT)) {
             binding.apply {
                 visitPurpose.isEnabled(false)
                 specialDemand.isEnabled(false)

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

@@ -24,7 +24,7 @@ class AirplaneThreeCodeActivity : BaseActivity<ActivityAirplaneThreeCodeBinding>
 
     override fun initTitle() {
         titleBinding = LayoutTitleBinding.bind(binding.root).apply {
-            titleText.text = resources.getString(R.string.airplane_three_code)
+            titleText.text = resources.getString(R.string.three_code_resource)
 
             if (OASystem.authorization(OASystem.THREE_CODE_RESOURCE, OASystem.ADD)) {
                 addButton.apply {

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

@@ -60,6 +60,8 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
         //根据已有权限设置可见界面
         OASystem.authData.forEach {
             when (it.pageId) {
+
+                //效率工具
                 OASystem.ADDRESS_BOOK -> {
                     binding.addressBook.visibility = View.VISIBLE
                     binding.addressBook.setOnClickListener(this)
@@ -80,60 +82,55 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
 //                    binding.groupPayment.setOnClickListener(this)
 //                }
 
-                OASystem.MARKET_CUSTOMER -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
+                //团组酒店
+                OASystem.HOTEL_RESOURCE -> {
+                    if (binding.groupHotel.visibility == View.GONE) {
+                        binding.groupHotel.visibility = View.VISIBLE
                     }
-                    binding.marketCustomerResource.visibility = View.VISIBLE
-                    binding.marketCustomerResource.setOnClickListener(this)
+                    binding.hotelResource.visibility = View.VISIBLE
+                    binding.hotelResource.setOnClickListener(this)
                 }
 
-                OASystem.INVITE_DATA -> {
-                    if (binding.groupInviteOfficial.visibility == View.GONE) {
-                        binding.groupInviteOfficial.visibility = View.VISIBLE
+                OASystem.HOTEL_PREDETERMINE -> {
+                    if (binding.groupHotel.visibility == View.GONE) {
+                        binding.groupHotel.visibility = View.VISIBLE
                     }
-                    binding.inviteData.visibility = View.VISIBLE
-                    binding.inviteData.setOnClickListener(this)
+                    binding.hotelPredetermine.visibility = View.VISIBLE
+                    binding.hotelPredetermine.setOnClickListener(this)
                 }
 
+                //团组OP
                 OASystem.GUIDE_RESOURCE -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
+                    if (binding.groupOp.visibility == View.GONE) {
+                        binding.groupOp.visibility = View.VISIBLE
                     }
                     binding.guideResource.visibility = View.VISIBLE
                     binding.guideResource.setOnClickListener(this)
                 }
 
                 OASystem.CAR_RESOURCE -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
+                    if (binding.groupOp.visibility == View.GONE) {
+                        binding.groupOp.visibility = View.VISIBLE
                     }
                     binding.carResource.visibility = View.VISIBLE
                     binding.carResource.setOnClickListener(this)
                 }
 
-                OASystem.HOTEL_RESOURCE -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
-                    }
-                    binding.hotelResource.visibility = View.VISIBLE
-                    binding.hotelResource.setOnClickListener(this)
-                }
-
-                OASystem.THREE_CODE_RESOURCE -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
+                OASystem.GROUND_CONVEY_PAYMENT_INSERT -> {
+                    if (binding.groupOp.visibility == View.GONE) {
+                        binding.groupOp.visibility = View.VISIBLE
                     }
-                    binding.airplaneThreeCode.visibility = View.VISIBLE
-                    binding.airplaneThreeCode.setOnClickListener(this)
+                    binding.groundConveyPaymentInsert.visibility = View.VISIBLE
+                    binding.groundConveyPaymentInsert.setOnClickListener(this)
                 }
 
-                OASystem.GROUP_OPERATION -> {
-                    if (binding.groupOperation.visibility == View.GONE) {
-                        binding.groupOperation.visibility = View.VISIBLE
+                //团组商邀公务
+                OASystem.INVITE_DATA -> {
+                    if (binding.groupInviteOfficial.visibility == View.GONE) {
+                        binding.groupInviteOfficial.visibility = View.VISIBLE
                     }
-                    binding.groupInformation.visibility = View.VISIBLE
-                    binding.groupInformation.setOnClickListener(this)
+                    binding.inviteData.visibility = View.VISIBLE
+                    binding.inviteData.setOnClickListener(this)
                 }
 
                 OASystem.INVITE_OFFICIAL_PAYMENT -> {
@@ -144,22 +141,16 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                     binding.inviteOfficialPayment.setOnClickListener(this)
                 }
 
-                OASystem.AIRPLANE_PAYMENT_INSERT -> {
-                    if (binding.groupAirplaneTicket.visibility == View.GONE) {
-                        binding.groupAirplaneTicket.visibility = View.VISIBLE
-                    }
-                    binding.airplanePaymentInsert.visibility = View.VISIBLE
-                    binding.airplanePaymentInsert.setOnClickListener(this)
-                }
-
-                OASystem.GROUND_CONVEY_PAYMENT_INSERT -> {
-                    if (binding.groupOp.visibility == View.GONE) {
-                        binding.groupOp.visibility = View.VISIBLE
+                //团组经理主管
+                OASystem.GROUP_INFORMATION -> {
+                    if (binding.groupManager.visibility == View.GONE) {
+                        binding.groupManager.visibility = View.VISIBLE
                     }
-                    binding.groundConveyPaymentInsert.visibility = View.VISIBLE
-                    binding.groundConveyPaymentInsert.setOnClickListener(this)
+                    binding.groupOperation.visibility = View.VISIBLE
+                    binding.groupOperation.setOnClickListener(this)
                 }
 
+                //团组签证
                 OASystem.VISA_PAYMENT_INSERT -> {
                     if (binding.groupVisa.visibility == View.GONE) {
                         binding.groupVisa.visibility = View.VISIBLE
@@ -168,21 +159,38 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                     binding.visaPaymentInsert.setOnClickListener(this)
                 }
 
-                OASystem.HOTEL_PREDETERMINE -> {
-                    if (binding.groupHotel.visibility == View.GONE) {
-                        binding.groupHotel.visibility = View.VISIBLE
-                    }
-                    binding.hotelPaymentInsert.visibility = View.VISIBLE
-                    binding.hotelPaymentInsert.setOnClickListener(this)
-                }
-
                 OASystem.INSURANCE_PAYMENT_INSERT -> {
-                    if (binding.groupCommonModel.visibility == View.GONE) {
-                        binding.groupCommonModel.visibility = View.VISIBLE
+                    if (binding.groupVisa.visibility == View.GONE) {
+                        binding.groupVisa.visibility = View.VISIBLE
                     }
                     binding.insurancePaymentInsert.visibility = View.VISIBLE
                     binding.insurancePaymentInsert.setOnClickListener(this)
                 }
+
+                //资源管理 （暂）
+                OASystem.MARKET_CUSTOMER -> {
+                    if (binding.resourceManage.visibility == View.GONE) {
+                        binding.resourceManage.visibility = View.VISIBLE
+                    }
+                    binding.marketCustomerResource.visibility = View.VISIBLE
+                    binding.marketCustomerResource.setOnClickListener(this)
+                }
+
+                //团组机票
+                OASystem.THREE_CODE_RESOURCE -> {
+                    if (binding.groupAirplaneTicket.visibility == View.GONE) {
+                        binding.groupAirplaneTicket.visibility = View.VISIBLE
+                    }
+                    binding.airplaneThreeCode.visibility = View.VISIBLE
+                    binding.airplaneThreeCode.setOnClickListener(this)
+                }
+                OASystem.AIRPLANE_PAYMENT_INSERT -> {
+                    if (binding.groupAirplaneTicket.visibility == View.GONE) {
+                        binding.groupAirplaneTicket.visibility = View.VISIBLE
+                    }
+                    binding.airplanePaymentInsert.visibility = View.VISIBLE
+                    binding.airplanePaymentInsert.setOnClickListener(this)
+                }
             }
         }
     }
@@ -238,7 +246,7 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                 startActivity(intent)
             }
 
-            binding.groupInformation.id -> {
+            binding.groupOperation.id -> {
                 val intent = Intent(OASystem.context, GroupInfoActivity::class.java)
                 startActivity(intent)
             }
@@ -264,7 +272,7 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                 startActivity(intent)
             }
 
-            binding.hotelPaymentInsert.id -> {
+            binding.hotelPredetermine.id -> {
                 val intent = Intent(OASystem.context, HotelPredetermineActivity::class.java)
                 startActivity(intent)
             }

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

@@ -328,7 +328,34 @@
                         android:background="@color/line_color" />
 
                     <LinearLayout
-                        android:id="@+id/hotel_payment_insert"
+                        android:id="@+id/hotel_resource"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/common_padding"
+                            android:gravity="center_vertical"
+                            android:paddingTop="@dimen/common_padding"
+                            android:paddingBottom="@dimen/common_padding"
+                            android:text="@string/hotel_resource"
+                            android:textColor="@color/text_color"
+                            android:textSize="@dimen/text_size_medium"
+                            app:drawableStartCompat="@mipmap/icon_hotel" />
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:layout_marginStart="35dp"
+                            android:background="@color/line_color" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/hotel_predetermine"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -341,7 +368,7 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/hotel_payment_insert"
+                            android:text="@string/hotel_predetermine"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
                             app:drawableStartCompat="@mipmap/icon_hotel_payment_insert" />
@@ -387,6 +414,60 @@
                         android:layout_marginTop="@dimen/common_padding"
                         android:background="@color/line_color" />
 
+                    <LinearLayout
+                        android:id="@+id/guide_resource"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/common_padding"
+                            android:gravity="center_vertical"
+                            android:paddingTop="@dimen/common_padding"
+                            android:paddingBottom="@dimen/common_padding"
+                            android:text="@string/guide_resource"
+                            android:textColor="@color/text_color"
+                            android:textSize="@dimen/text_size_medium"
+                            app:drawableStartCompat="@mipmap/icon_guide" />
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:layout_marginStart="35dp"
+                            android:background="@color/line_color" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/car_resource"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:visibility="gone">
+
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:drawablePadding="@dimen/common_padding"
+                            android:gravity="center_vertical"
+                            android:paddingTop="@dimen/common_padding"
+                            android:paddingBottom="@dimen/common_padding"
+                            android:text="@string/car_resource"
+                            android:textColor="@color/text_color"
+                            android:textSize="@dimen/text_size_medium"
+                            app:drawableStartCompat="@mipmap/icon_car" />
+
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:layout_marginStart="35dp"
+                            android:background="@color/line_color" />
+
+                    </LinearLayout>
+
                     <LinearLayout
                         android:id="@+id/ground_convey_payment_insert"
                         android:layout_width="match_parent"
@@ -500,7 +581,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/group_operation"
+                android:id="@+id/group_manager"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -524,7 +605,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_padding"
-                        android:text="@string/group_management"
+                        android:text="@string/group_manager"
                         android:textColor="@color/text_color"
                         android:textSize="@dimen/text_size_minimum" />
 
@@ -535,7 +616,7 @@
                         android:background="@color/line_color" />
 
                     <LinearLayout
-                        android:id="@+id/group_information"
+                        android:id="@+id/group_operation"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -548,7 +629,7 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/pick_up_group_info"
+                            android:text="@string/group_operation"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
                             app:drawableStartCompat="@mipmap/icon_group_information" />
@@ -616,45 +697,6 @@
 
                     </LinearLayout>
 
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/group_common_model"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="vertical"
-                android:visibility="gone">
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/common_padding"
-                    android:background="@color/background_color" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginStart="25dp"
-                    android:layout_marginEnd="25dp"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/common_padding"
-                        android:text="@string/group_common_model"
-                        android:textColor="@color/text_color"
-                        android:textSize="@dimen/text_size_minimum" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginTop="@dimen/common_padding"
-                        android:background="@color/line_color" />
-
                     <LinearLayout
                         android:id="@+id/insurance_payment_insert"
                         android:layout_width="match_parent"
@@ -681,7 +723,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/group_airplane_ticket"
+                android:id="@+id/group_common_model"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -705,7 +747,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_padding"
-                        android:text="@string/group_airplane_ticket"
+                        android:text="@string/group_common_model"
                         android:textColor="@color/text_color"
                         android:textSize="@dimen/text_size_minimum" />
 
@@ -715,33 +757,12 @@
                         android:layout_marginTop="@dimen/common_padding"
                         android:background="@color/line_color" />
 
-                    <LinearLayout
-                        android:id="@+id/airplane_payment_insert"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="gone">
-
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="@dimen/common_padding"
-                            android:gravity="center_vertical"
-                            android:paddingTop="@dimen/common_padding"
-                            android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/airplane_payment_insert"
-                            android:textColor="@color/text_color"
-                            android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_airplane_payment_insert" />
-
-                    </LinearLayout>
-
                 </LinearLayout>
 
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/resource_manage"
+                android:id="@+id/group_airplane_ticket"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -754,7 +775,6 @@
                     android:background="@color/background_color" />
 
                 <LinearLayout
-
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
@@ -766,7 +786,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/common_padding"
-                        android:text="@string/resource_management"
+                        android:text="@string/group_airplane_ticket"
                         android:textColor="@color/text_color"
                         android:textSize="@dimen/text_size_minimum" />
 
@@ -777,7 +797,7 @@
                         android:background="@color/line_color" />
 
                     <LinearLayout
-                        android:id="@+id/market_customer_resource"
+                        android:id="@+id/airplane_three_code"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -790,10 +810,10 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/market_customer_resource"
+                            android:text="@string/three_code_resource"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_customer_resource" />
+                            app:drawableStartCompat="@mipmap/icon_airplane_three_code" />
 
                         <View
                             android:layout_width="match_parent"
@@ -804,7 +824,7 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/service_resource"
+                        android:id="@+id/airplane_payment_insert"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -817,75 +837,55 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/meeting_activity_service_resource"
+                            android:text="@string/airplane_payment_insert"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_service_resource" />
-
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginStart="35dp"
-                            android:background="@color/line_color" />
+                            app:drawableStartCompat="@mipmap/icon_airplane_payment_insert" />
 
                     </LinearLayout>
 
-                    <LinearLayout
-                        android:id="@+id/guide_resource"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="gone">
+                </LinearLayout>
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="@dimen/common_padding"
-                            android:gravity="center_vertical"
-                            android:paddingTop="@dimen/common_padding"
-                            android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/guide_resource"
-                            android:textColor="@color/text_color"
-                            android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_guide" />
+            </LinearLayout>
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginStart="35dp"
-                            android:background="@color/line_color" />
+            <LinearLayout
+                android:id="@+id/resource_manage"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:visibility="gone">
 
-                    </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/common_padding"
+                    android:background="@color/background_color" />
 
-                    <LinearLayout
-                        android:id="@+id/car_resource"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:visibility="gone">
+                <LinearLayout
 
-                        <TextView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:drawablePadding="@dimen/common_padding"
-                            android:gravity="center_vertical"
-                            android:paddingTop="@dimen/common_padding"
-                            android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/car_resource"
-                            android:textColor="@color/text_color"
-                            android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_car" />
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginEnd="25dp"
+                    android:orientation="vertical">
 
-                        <View
-                            android:layout_width="match_parent"
-                            android:layout_height="1dp"
-                            android:layout_marginStart="35dp"
-                            android:background="@color/line_color" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/common_padding"
+                        android:text="@string/resource_management"
+                        android:textColor="@color/text_color"
+                        android:textSize="@dimen/text_size_minimum" />
 
-                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginTop="@dimen/common_padding"
+                        android:background="@color/line_color" />
 
                     <LinearLayout
-                        android:id="@+id/hotel_resource"
+                        android:id="@+id/market_customer_resource"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -898,10 +898,10 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/hotel_resource"
+                            android:text="@string/market_customer_resource"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_hotel" />
+                            app:drawableStartCompat="@mipmap/icon_customer_resource" />
 
                         <View
                             android:layout_width="match_parent"
@@ -912,7 +912,7 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/airplane_three_code"
+                        android:id="@+id/service_resource"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -925,10 +925,10 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/airplane_three_code"
+                            android:text="@string/meeting_activity_service_resource"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_airplane_three_code" />
+                            app:drawableStartCompat="@mipmap/icon_service_resource" />
 
                         <View
                             android:layout_width="match_parent"

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

@@ -142,7 +142,7 @@
     <string name="exchange_tool">汇率换算</string>
 
     <string name="group_hotel">团组酒店</string>
-    <string name="hotel_payment_insert">酒店费用录入</string>
+    <string name="hotel_predetermine">酒店预定</string>
 
     <string name="group_op">团组OP</string>
     <string name="ground_convey_payment_insert">地接费用录入</string>
@@ -150,8 +150,8 @@
     <string name="group_invite_official">团组商邀公务</string>
     <string name="invite_official_payment">邀请公务费用</string>
 
-    <string name="group_management">团组管理</string>
-    <string name="pick_up_group_info">接团信息</string>
+    <string name="group_manager">团组经理主管</string>
+    <string name="group_operation">团组操作 / 接团客户名单</string>
 
     <string name="group_visa">团组签证</string>
     <string name="visa_payment_insert">签证费用录入</string>
@@ -165,10 +165,10 @@
     <string name="resource_management">资源管理</string>
     <string name="market_customer_resource">市场客户资料</string>
     <string name="meeting_activity_service_resource">会务活动供应商资源</string>
-    <string name="guide_resource">导游地接供应商资源</string>
-    <string name="car_resource">车辆供应商资源</string>
-    <string name="hotel_resource">酒店资料数据</string>
-    <string name="airplane_three_code">机场三字码资料数据</string>
+    <string name="guide_resource">导游地接资料</string>
+    <string name="car_resource">车公司资料</string>
+    <string name="hotel_resource">酒店资料</string>
+    <string name="three_code_resource">三字码资料表</string>
 
     <string name="press_back_again_exit">再按一次退出程序</string>