2024-04-25 修改

修改:

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

app/src/main/java/com/pan_american/android/ui/resource_management/market_customer/MarketCustomerActivity.kt

@@ -117,7 +117,7 @@ class MarketCustomerActivity : BaseActivity<ActivityMarketCustomerBinding>() {
     override fun initViews() {
 
         titleBinding = LayoutTitleBinding.bind(binding.root).apply {
-            titleText.text = resources.getString(R.string.market_customer_resource)
+            titleText.text = resources.getString(R.string.company_customer_resource)
             searchView.visibility = View.VISIBLE
         }
 

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

@@ -169,11 +169,11 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
 
                 //资源管理 （暂）
                 OASystem.MARKET_CUSTOMER -> {
-                    if (binding.resourceManage.visibility == View.GONE) {
-                        binding.resourceManage.visibility = View.VISIBLE
+                    if (binding.customerResource.visibility == View.GONE) {
+                        binding.customerResource.visibility = View.VISIBLE
                     }
-                    binding.marketCustomerResource.visibility = View.VISIBLE
-                    binding.marketCustomerResource.setOnClickListener(this)
+                    binding.companyCustomerResource.visibility = View.VISIBLE
+                    binding.companyCustomerResource.setOnClickListener(this)
                 }
 
                 //团组机票
@@ -216,13 +216,13 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
 //
 //            }
 
-            binding.marketCustomerResource.id -> {
-                val intent = Intent(OASystem.context, MarketCustomerActivity::class.java)
+            binding.hotelResource.id -> {
+                val intent = Intent(OASystem.context, HotelResourceActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.inviteData.id -> {
-                val intent = Intent(OASystem.context, InviteDataActivity::class.java)
+            binding.hotelPredetermine.id -> {
+                val intent = Intent(OASystem.context, HotelPredetermineActivity::class.java)
                 startActivity(intent)
             }
 
@@ -236,18 +236,13 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                 startActivity(intent)
             }
 
-            binding.hotelResource.id -> {
-                val intent = Intent(OASystem.context, HotelResourceActivity::class.java)
-                startActivity(intent)
-            }
-
-            binding.airplaneThreeCode.id -> {
-                val intent = Intent(OASystem.context, AirplaneThreeCodeActivity::class.java)
+            binding.groundConveyPaymentInsert.id -> {
+                val intent = Intent(OASystem.context, GroundConveyPaymentInsertActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.groupOperation.id -> {
-                val intent = Intent(OASystem.context, GroupInfoActivity::class.java)
+            binding.inviteData.id -> {
+                val intent = Intent(OASystem.context, InviteDataActivity::class.java)
                 startActivity(intent)
             }
 
@@ -257,28 +252,33 @@ class WorkspaceFragment : BaseFragment<FragmentWorkspaceBinding>(), OnClickListe
                 startActivity(intent)
             }
 
-            binding.airplanePaymentInsert.id -> {
-                val intent = Intent(OASystem.context, AirplaneTicketPaymentActivity::class.java)
+            binding.groupOperation.id -> {
+                val intent = Intent(OASystem.context, GroupInfoActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.groundConveyPaymentInsert.id -> {
-                val intent = Intent(OASystem.context, GroundConveyPaymentInsertActivity::class.java)
+            binding.visaPaymentInsert.id -> {
+                val intent = Intent(OASystem.context, VisaPaymentInsertActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.visaPaymentInsert.id -> {
-                val intent = Intent(OASystem.context, VisaPaymentInsertActivity::class.java)
+            binding.insurancePaymentInsert.id -> {
+                val intent = Intent(OASystem.context, InsurancePaymentInsertActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.hotelPredetermine.id -> {
-                val intent = Intent(OASystem.context, HotelPredetermineActivity::class.java)
+            binding.companyCustomerResource.id -> {
+                val intent = Intent(OASystem.context, MarketCustomerActivity::class.java)
                 startActivity(intent)
             }
 
-            binding.insurancePaymentInsert.id -> {
-                val intent = Intent(OASystem.context, InsurancePaymentInsertActivity::class.java)
+            binding.airplaneThreeCode.id -> {
+                val intent = Intent(OASystem.context, AirplaneThreeCodeActivity::class.java)
+                startActivity(intent)
+            }
+
+            binding.airplanePaymentInsert.id -> {
+                val intent = Intent(OASystem.context, AirplaneTicketPaymentActivity::class.java)
                 startActivity(intent)
             }
         }

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

@@ -723,7 +723,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/group_common_model"
+                android:id="@+id/customer_resource"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -736,45 +736,7 @@
                     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>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/group_airplane_ticket"
-                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"
@@ -786,7 +748,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/customer_resource"
                         android:textColor="@color/text_color"
                         android:textSize="@dimen/text_size_minimum" />
 
@@ -797,7 +759,7 @@
                         android:background="@color/line_color" />
 
                     <LinearLayout
-                        android:id="@+id/airplane_three_code"
+                        android:id="@+id/company_customer_resource"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -810,10 +772,10 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/three_code_resource"
+                            android:text="@string/company_customer_resource"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_airplane_three_code" />
+                            app:drawableStartCompat="@mipmap/icon_customer_resource" />
 
                         <View
                             android:layout_width="match_parent"
@@ -824,7 +786,7 @@
                     </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/airplane_payment_insert"
+                        android:id="@+id/service_resource"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
@@ -837,10 +799,16 @@
                             android:gravity="center_vertical"
                             android:paddingTop="@dimen/common_padding"
                             android:paddingBottom="@dimen/common_padding"
-                            android:text="@string/airplane_payment_insert"
+                            android:text="@string/meeting_activity_service_resource"
                             android:textColor="@color/text_color"
                             android:textSize="@dimen/text_size_medium"
-                            app:drawableStartCompat="@mipmap/icon_airplane_payment_insert" />
+                            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" />
 
                     </LinearLayout>
 
@@ -849,7 +817,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/resource_manage"
+                android:id="@+id/group_common_model"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/white"
@@ -862,7 +830,45 @@
                     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>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/group_airplane_ticket"
+                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"
@@ -874,7 +880,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" />
 
@@ -885,7 +891,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"
@@ -898,10 +904,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"
@@ -912,7 +918,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"
@@ -925,16 +931,10 @@
                             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>
 

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

@@ -162,8 +162,8 @@
     <string name="group_airplane_ticket">团组机票</string>
     <string name="airplane_payment_insert">机票费用录入</string>
 
-    <string name="resource_management">资源管理</string>
-    <string name="market_customer_resource">市场客户资料</string>
+    <string name="customer_resource">客户资料模块</string>
+    <string name="company_customer_resource">公司客户资料</string>
     <string name="meeting_activity_service_resource">会务活动供应商资源</string>
     <string name="guide_resource">导游地接资料</string>
     <string name="car_resource">车公司资料</string>