2025-01-08 新增 / 修改

新增：
1. 团组商邀公务 - 公务出访 添加 / 修改 新增: 来源 / 翻译人员详情
2. 团组商邀公务 - 公务出访 添加 / 修改 新增UI联动

修改：
1. 部分权限声明逻辑修改
2. BUG修改

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

@@ -0,0 +1,6 @@
+package com.pan_american.android.data.model.common.network
+
+import com.pan_american.android.base.BaseRequest
+
+class CurrencyListRequest(var currencyName: String = ""): BaseRequest() {
+}

app/src/main/java/com/pan_american/android/data/model/group_invite_official/official_visits/entity/OfficialVisitDetail.kt

@@ -3,12 +3,11 @@ package com.pan_american.android.data.model.group_invite_official.official_visit
 import com.pan_american.android.OASystem
 
 open class OfficialVisitDetail {
+    var dataSource = 0
     var id = 0
     var diId = 0
-    var nature = ""
     var type = 0
     var client = ""
-    var confirmTheInvitation = 0
     var date = ""
     var time = ""
     var address = ""
@@ -19,18 +18,21 @@ open class OfficialVisitDetail {
     var setting = ""
     var dresscode = ""
     var attendees = ""
-    var isNeedTrans = -1
-    var translators = ""
+    var isNeedTrans = 0
+    var translatorIdItem = listOf<Int>()
     var language = ""
     var trip = ""
     var createUserId = OASystem.userInfo.userId
     var remark = ""
     var isSubmitApproval = -1
     var isPay = -1
-    var emailOrWeChat = ""
-    var website = ""
     var country = ""
     var area = ""
     var field = ""
     var reqSample = ""
+    var emailOrWeChat = ""
+    var website = ""
+    var nature = ""
+
+    var confirmTheInvitation = 0
 }

app/src/main/java/com/pan_american/android/data/model/group_invite_official/official_visits/entity/TranslatorInfo.kt

@@ -0,0 +1,16 @@
+package com.pan_american.android.data.model.group_invite_official.official_visits.entity
+
+class TranslatorInfo {
+    var id = 0
+    var area = ""
+    var name = ""
+    var sex = 0
+    var tel = ""
+    var email = ""
+    var wechatNo = ""
+    var otherSocialAccounts = ""
+    var language = ""
+    var price = 0.0
+    var currency = 0
+    var currencyName = ""
+}

app/src/main/java/com/pan_american/android/data/model/group_invite_official/official_visits/network/GetOfficialVisitDetailResponse.kt

@@ -2,8 +2,9 @@ package com.pan_american.android.data.model.group_invite_official.official_visit
 
 import com.pan_american.android.base.BaseResponse
 import com.pan_american.android.data.model.group_invite_official.official_visits.entity.OfficialVisitDetail
+import com.pan_american.android.data.model.group_invite_official.official_visits.entity.TranslatorInfo
 
 class GetOfficialVisitDetailResponse(val data: Data): BaseResponse() {
 
-    inner class Data(val screenshotOfMailUrls: List<String>): OfficialVisitDetail()
+    inner class Data(val screenshotOfMailUrls: List<String>, val translatorInfo: TranslatorInfo): OfficialVisitDetail()
 }

app/src/main/java/com/pan_american/android/data/model/group_invite_official/official_visits/network/UpdateOfficialVisitRequest.kt

@@ -1,7 +1,8 @@
 package com.pan_american.android.data.model.group_invite_official.official_visits.network
 
 import com.pan_american.android.data.model.group_invite_official.official_visits.entity.OfficialVisitDetail
+import com.pan_american.android.data.model.group_invite_official.official_visits.entity.TranslatorInfo
 
-class UpdateOfficialVisitRequest: OfficialVisitDetail() {
+class UpdateOfficialVisitRequest(val translatorInfo: TranslatorInfo = TranslatorInfo()): OfficialVisitDetail() {
     var status = 0
 }

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

@@ -8,6 +8,7 @@ import com.pan_american.android.data.model.address_book.network.DepartmentListRe
 import com.pan_american.android.data.model.address_book.network.DepartmentListResponse
 import com.pan_american.android.data.model.address_book.network.MemberListRequest
 import com.pan_american.android.data.model.address_book.network.MemberListResponse
+import com.pan_american.android.data.model.common.network.CurrencyListRequest
 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
@@ -1415,4 +1416,10 @@ interface APIService {
      */
     @POST("/api/Groups/EnterExitCostMobileOpSingleStep7")
     fun updateEntryAndExitOtherPayment(@Body updateOtherPaymentRequest: UpdateOtherPaymentRequest): Call<BaseResponse>
+
+    /**
+     * 通用接口，获取所有币种
+     */
+    @POST("/api/Groups/EnterExitCostMobileCurrencyData")
+    fun getCurrencyList(@Body currencyListRequest: CurrencyListRequest): Call<SelectorResponse>
 }

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

@@ -5,7 +5,7 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 object ServiceCreator {
 
-    private const val BASE_URL = "http://132.232.92.186:8888"
+    private const val BASE_URL = "http://132.232.92.186:9001"
 
     private val retrofit = Retrofit.Builder().apply {
         baseUrl(BASE_URL)

app/src/main/java/com/pan_american/android/ui/customer_resource/customer_distribution/CustomerDistributionMap.kt

@@ -102,7 +102,6 @@ class CustomerDistributionMap : BaseActivity<ActivityCustomerDistributionMapBind
         //  aMap.moveCamera(CameraUpdateFactory.newLatLngZoom(LatLng(39.90403, 116.407526), 10f))
     }
 
-
     /**
      * 请求位置权限，并处理权限请求结果。
      */
@@ -160,7 +159,6 @@ class CustomerDistributionMap : BaseActivity<ActivityCustomerDistributionMapBind
 
     override fun activate(listener: OnLocationChangedListener) {
         locationChangedListener = listener
-        locationClient?.startLocation()
     }
 
     override fun deactivate() {

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

@@ -101,4 +101,6 @@
 
     </LinearLayout>
 
+
+
 </LinearLayout>

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

@@ -102,6 +102,7 @@
     <string name="gender">性别</string>
     <string name="male">男</string>
     <string name="female">女</string>
+    <string name="no_setting">未设置</string>
 
     <string name="company">公司</string>
     <string name="department">部门</string>
@@ -1111,10 +1112,19 @@
     <string name="official_contact_job">公务方联系人职务</string>
     <string name="official_contact">公务方联系人</string>
     <string name="official_type">公务形式</string>
+    <string name="source">来源</string>
     <string name="dress_demand">着装要求</string>
     <string name="need_translator">需要翻译</string>
     <string name="translator">翻译人员</string>
+    <string name="translator_area">翻译人员地区</string>
+    <string name="translator_sex">翻译人员性别</string>
+    <string name="translator_phone">翻译联系电话</string>
+    <string name="translator_email">翻译人员邮箱</string>
+    <string name="translator_wechat">翻译人员微信</string>
+    <string name="translator_other_accounts">翻译人员其它账号</string>
     <string name="translate_language">翻译语种</string>
+    <string name="translate_payment">翻译费用</string>
+    <string name="translate_payment_currency">翻译币种</string>
     <string name="is_approval">是否报批</string>
     <string name="email_or_wechat">邮件/微信</string>
     <string name="website">网址</string>
@@ -1130,8 +1140,6 @@
     <string name="confirm_success">确认成功</string>
     <string name="operate_success">操作成功</string>
 
-
-
     <string name="country_input_hint">请输入国家</string>
     <string name="area_input_hint">请输入地区</string>
     <string name="official_department_input_hint">请输入公务单位</string>
@@ -1143,6 +1151,7 @@
     <string name="official_contact_input_hint">请输入公务方联系人</string>
     <string name="phone_input_hint">请输入联系电话</string>
     <string name="official_type_select_hint">请选择公务形式</string>
+    <string name="official_source_select_hint">请选择公务来源</string>
     <string name="official_dress_demand_input_hint">请输入着装要求</string>
     <string name="official_industry_input_hint">请输入涉及领域</string>
     <string name="translate_language_input_hint">请输入翻译语种</string>
@@ -1152,6 +1161,16 @@
     <string name="official_background_input_hint">请输入公务方背景</string>
     <string name="picture_upload_hint">请上传图片</string>
 
+    <string name="translator_input_hint">请输入翻译人员</string>
+    <string name="translator_area_hint">请输入翻译人员地区</string>
+    <string name="translator_phone_hint">请输入翻译人员电话</string>
+    <string name="translator_email_hint">请输入翻译人员邮箱</string>
+    <string name="translator_wechat_hint">请输入翻译人员微信</string>
+    <string name="translator_other_account_hint">请输入翻译人员其它账号</string>
+    <string name="translator_language">请输入翻译语种</string>
+    <string name="translator_payment_hint">请输入翻译费用</string>
+    <string name="translator_currency_hint">请选择翻译币种</string>
+
     <string name="picture_select_error_hint">图片路径获取失败，请从系统图片选择器选择图片</string>
     <string name="picture_upload_error">图片文件上传错误</string>
     <string name="official_visit_detail_get_error">公务出访详情获取错误</string>