2024-05-22 新增

新增

1. 酒店预定/详情界面 新增 显示成本 弹出弹窗展示成本表格

app/build.gradle

@@ -90,4 +90,7 @@ dependencies {
 
     //SignalR
     implementation 'com.microsoft.signalr:signalr:1.0.0'
+
+    //表格组件
+    implementation 'com.github.huangyanbin:SmartTable:2.2.0'
 }

app/src/main/java/com/pan_american/android/data/model/common/network/GroupCostDataRequest.kt

@@ -0,0 +1,9 @@
+package com.pan_american.android.data.model.common.network
+
+import com.pan_american.android.OASystem
+
+class GroupCostDataRequest(val diId: Int, val cTable: Int) {
+
+    val userId = OASystem.userInfo.userId
+
+}

app/src/main/java/com/pan_american/android/data/model/group_hotel/hotel_payment_insert/entity/HotelCost.kt

@@ -0,0 +1,22 @@
+package com.pan_american.android.data.model.group_hotel.hotel_payment_insert.entity
+
+import com.bin.david.form.annotation.SmartColumn
+import com.bin.david.form.annotation.SmartTable
+
+@SmartTable(name = "酒店成本数据")
+class HotelCost {
+    @SmartColumn(id = 2, name = "日期", fixed = true)
+    var date = ""
+    @SmartColumn(id = 3, name = "酒店名称")
+    var accon = ""
+    @SmartColumn(id = 4, name = "行程描述")
+    var itin = ""
+    @SmartColumn(id = 5, name = "单人间")
+    var sgr = 0.0
+    @SmartColumn(id = 6, name = "双人间")
+    var tbr = 0.0
+    @SmartColumn(id = 7, name = "小套房")
+    var jS_ES = 0.0
+    @SmartColumn(id = 8, name = "大套房")
+    var suite = 0.0
+}

app/src/main/java/com/pan_american/android/data/model/group_hotel/hotel_payment_insert/network/HotelCostDetailResponse.kt

@@ -0,0 +1,11 @@
+package com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network
+
+import com.pan_american.android.base.BaseResponse
+import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.entity.HotelCost
+
+class HotelCostDetailResponse(val data: Data): BaseResponse() {
+
+    inner class Data (val modulePromptInfos: ArrayList<HotelCostDetail>)
+
+    inner class HotelCostDetail (val currencyCode: String, val rate: Double, val data: ArrayList<HotelCost>)
+}

app/src/main/java/com/pan_american/android/data/network/APIService.kt

@@ -10,6 +10,7 @@ import com.pan_american.android.data.model.address_book.network.MemberListRespon
 import com.pan_american.android.data.model.common.network.DeleteRequest
 import com.pan_american.android.data.model.common.network.GroupClientListRequest
 import com.pan_american.android.data.model.common.network.GroupClientListResponse
+import com.pan_american.android.data.model.common.network.GroupCostDataRequest
 import com.pan_american.android.data.model.common.network.GroupCurrencyRequest
 import com.pan_american.android.data.model.common.network.GroupCurrencyResponse
 import com.pan_american.android.data.model.common.network.GroupSimpleInfoRequest
@@ -45,6 +46,7 @@ import com.pan_american.android.data.model.group_common_modle.insurance_payment_
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.entity.UpdateHotelPredetermine
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.GetHotelPredetermineDetailRequest
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.GetHotelPredetermineDetailResponse
+import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelCostDetailResponse
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelPredetermineListRequest
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelPredetermineListResponse
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelPredetermineResourceRequest
@@ -230,6 +232,12 @@ interface APIService {
     @POST("/api/Resource/QueryHotelData")
     fun getHotelResourceList(@Body hotelResourceListRequest: HotelResourceListRequest): Call<HotelResourceListResponse>
 
+    /**
+     * 酒店资料数据，团组成本
+     */
+    @POST("/api/Groups/PostGroupCostModulePrompt")
+    fun getGroupHotelCostData(@Body groupCostDataRequest: GroupCostDataRequest): Call<HotelCostDetailResponse>
+
     /**
      * 酒店资料数据，根据ID查询酒店资料详情
      */

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

@@ -3,10 +3,17 @@ package com.pan_american.android.ui.group_hotel.hotel_predetermine
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
+import android.util.Log
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
+import android.widget.PopupWindow
 import android.widget.TextView
 import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.bin.david.form.core.SmartTable
+import com.bin.david.form.data.style.FontStyle
+import com.google.gson.Gson
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
@@ -15,9 +22,12 @@ import com.pan_american.android.base.CardAdapter
 import com.pan_american.android.base.CustomAlertDialog
 import com.pan_american.android.base.ListAdapter
 import com.pan_american.android.data.model.common.entity.Selector
+import com.pan_american.android.data.model.common.network.GroupCostDataRequest
+import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.entity.HotelCost
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.entity.UpdateHotelPredetermine
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.GetHotelPredetermineDetailRequest
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.GetHotelPredetermineDetailResponse
+import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelCostDetailResponse
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelPredetermineResourceRequest
 import com.pan_american.android.data.model.group_hotel.hotel_payment_insert.network.HotelPredetermineResourceResponse
 import com.pan_american.android.data.network.APIService
@@ -168,6 +178,14 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
 
     private var isAuditGM = -1
 
+    private var hotelCostInit = false
+
+    private var hotelCostCurrency = ""
+
+    private var hotelCostExchangeRate = 0.0
+
+    private var hotelCostList = ArrayList<HotelCost>()
+
     override fun getViewBinding() = ActivityAddHotelPredetermineBinding.inflate(layoutInflater)
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -204,9 +222,79 @@ class AddHotelPredetermineActivity : BaseActivity<ActivityAddHotelPredetermineBi
                 binding.commit.setText(resources.getString(R.string.add))
             }
 
+            rightTextField.apply {
+                visibility = View.VISIBLE
+                text = resources.getString(R.string.show_cost)
+            }
+
             backButton.setOnClickListener {
                 back()
             }
+
+            rightTextField.setOnClickListener {
+
+                val hotelCostPopView = View.inflate(OASystem.context, R.layout.popup_hotel_cost, null)
+                popupWindow = PopupWindow(hotelCostPopView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+
+                showPopupWindow {
+
+                    val currencyAbbr = hotelCostPopView.findViewById<TextView>(R.id.currency_abbr)
+                    val exchangeRate = hotelCostPopView.findViewById<TextView>(R.id.exchange_rate)
+                    val hotelCostTable = hotelCostPopView.findViewById<SmartTable<HotelCost>>(R.id.table)
+
+                    hotelCostTable.config.apply {
+                        isShowXSequence = false
+                        isShowYSequence = false
+                        tableTitleStyle = FontStyle(50, ResourcesCompat.getColor(resources, R.color.text_color, theme))
+                        contentStyle = FontStyle(40, ResourcesCompat.getColor(resources, R.color.text_color, theme))
+                    }
+
+                    if (!hotelCostInit) {
+                        apiService.getGroupHotelCostData(GroupCostDataRequest(groupId, OASystem.C_TABLE_HOTEL_PREDETERMINE)).enqueue(object : Callback<HotelCostDetailResponse> {
+                            override fun onResponse(
+                                call: Call<HotelCostDetailResponse>,
+                                response: Response<HotelCostDetailResponse>
+                            ) {
+
+                                Log.e("request", Gson().toJson(GroupCostDataRequest(groupId, OASystem.C_TABLE_HOTEL_PREDETERMINE)))
+
+                                val costResponse = response.body()
+
+                                if (costResponse != null) {
+                                    if (costResponse.code == 200) {
+
+                                        hotelCostCurrency = costResponse.data.modulePromptInfos[0].currencyCode
+                                        hotelCostExchangeRate = costResponse.data.modulePromptInfos[0].rate
+
+                                        hotelCostList = costResponse.data.modulePromptInfos[0].data
+
+                                        currencyAbbr.text = hotelCostCurrency
+                                        exchangeRate.text = hotelCostExchangeRate.toString()
+
+                                        hotelCostTable.setData(hotelCostList)
+
+                                        hotelCostInit = true
+
+                                    } else {
+                                        showMessage(costResponse.msg)
+                                    }
+                                }
+                            }
+
+                            override fun onFailure(call: Call<HotelCostDetailResponse>, t: Throwable) {
+                                showErrorInfo(R.string.hotel_cost_detail_get_failed)
+                            }
+                        })
+                    } else {
+                        currencyAbbr.text = hotelCostCurrency
+                        exchangeRate.text = hotelCostExchangeRate.toString()
+
+                        hotelCostTable.setData(hotelCostList)
+                    }
+
+                    popupWindow.showAtLocation(binding.root, Gravity.BOTTOM, 0, 0)
+                }
+            }
         }
     }
 

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

@@ -24,7 +24,7 @@
             <TextView
                 android:id="@+id/customer_name"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:ellipsize="marquee"
@@ -67,7 +67,7 @@
             <TextView
                 android:id="@+id/customer_gender"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:background="@color/white"
@@ -101,7 +101,7 @@
             <TextView
                 android:id="@+id/customer_unit"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:background="@color/white"
@@ -135,7 +135,7 @@
             <TextView
                 android:id="@+id/customer_job"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:background="@color/white"
@@ -169,7 +169,7 @@
             <TextView
                 android:id="@+id/berth_name"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginStart="@dimen/common_padding"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:layout_weight="1"

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:viewBindingIgnore="true">
+
+
+
+</LinearLayout>

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

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_corner_white"
+    android:orientation="vertical"
+    tools:viewBindingIgnore="true">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/common_padding"
+        android:layout_marginTop="@dimen/common_padding_huge"
+        android:layout_marginEnd="@dimen/common_padding"
+        android:layout_marginBottom="@dimen/common_padding"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/currency"
+            android:textColorHint="@color/text_color"
+            android:textSize="@dimen/text_size_medium" />
+
+        <TextView
+            android:id="@+id/currency_abbr"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="end"
+            android:hint="@string/no_info"
+            android:textColor="@color/text_color"
+            android:textColorHint="@color/hint_text_color"
+            android:textSize="@dimen/text_size_medium" />
+
+        <View
+            android:layout_width="@dimen/line"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/common_padding_heavy"
+            android:layout_marginEnd="@dimen/common_padding_heavy"
+            android:background="@color/line_color" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/exchange_rate"
+            android:textColorHint="@color/text_color"
+            android:textSize="@dimen/text_size_medium" />
+
+        <TextView
+            android:id="@+id/exchange_rate"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="end"
+            android:hint="@string/no_info"
+            android:textColor="@color/text_color"
+            android:textColorHint="@color/hint_text_color"
+            android:textSize="@dimen/text_size_medium" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/line"
+        android:layout_marginStart="@dimen/common_padding"
+        android:layout_marginEnd="@dimen/common_padding"
+        android:background="@color/line_color" />
+
+    <com.bin.david.form.core.SmartTable
+        android:id="@+id/table"
+        android:layout_width="match_parent"
+        android:layout_height="500dp"
+        android:layout_margin="@dimen/common_padding" />
+
+</LinearLayout>

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

@@ -48,6 +48,7 @@
     <string name="count">数量</string>
 
     <string name="currency">币种</string>
+    <string name="exchange_rate">汇率</string>
 
     <string name="notes">备注</string>
 
@@ -105,6 +106,8 @@
 
     <string name="boss_name">Zhang Hailin</string>
 
+    <string name="show_cost">显示成本</string>
+    
     <!-- AlertDialog通用文本 -->
     <string name="alert">警告</string>
     <string name="delete_alert_text">确认要删除：%s ?</string>
@@ -804,6 +807,7 @@
 
     <!-- 酒店费用详情，错误信息 -->
     <string name="hotel_predetermine_info_get_failed">酒店费用详情获取失败</string>
+    <string name="hotel_cost_detail_get_failed">酒店成本资料获取失败</string>
 
     <!-- 保险费用录入 -->
     <string name="insurance_payment_list">保险费用列表</string>