2024-08-05 修改

1. 团组操作/接团客户名单 - 团组基本信息新增 是否用于投标团，并修改和优化必填逻辑判断

app/build.gradle

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

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

@@ -20,6 +20,7 @@ class GroupOperationRequest: BaseRequest() {
     var visitDays = 0
     var visitPNumber = 0
     var tontractTime = ""
+    var isBid = 0
     var payDay = 0
     var paymentMoney = 0.0
     var visitPurpose = ""

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

@@ -21,6 +21,8 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
 
     private var opPercentageSelected = false
 
+    private var isForBid = false
+
     private var opPercentageSubLevel = listOf<String>()
 
     override fun getViewBinding(
@@ -66,6 +68,19 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             visitDays.setText(OASystem.groupOperationRequest.visitDays.toString())
             visitMembers.setText(OASystem.groupOperationRequest.visitPNumber.toString())
             contractDate.text = OASystem.groupOperationRequest.tontractTime
+
+            when(OASystem.groupOperationRequest.isBid) {
+                1 -> {
+                    binding.isForBidYes.isChecked = true
+                    this@GroupInfoBaseFragment.isForBid = true
+                }
+
+                0 -> {
+                    binding.isForBidNo.isChecked = true
+                    this@GroupInfoBaseFragment.isForBid = false
+                }
+            }
+
             visitDaysBefore.setText(OASystem.groupOperationRequest.payDay.toString())
             prePayment.setText(OASystem.groupOperationRequest.paymentMoney.toString())
 
@@ -275,6 +290,21 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             showDatePicker(resources.getString(R.string.contract_date), binding.contractDate) {}
         }
 
+        binding.isForBid.setOnCheckedChangeListener { radioGroup, i ->
+            if (radioGroup.id == binding.isForBid.id) {
+                when(i) {
+                    binding.isForBidYes.id -> {
+                        OASystem.groupOperationRequest.isBid = 1
+                        isForBid = true
+                    }
+                    binding.isForBidNo.id -> {
+                        OASystem.groupOperationRequest.isBid = 0
+                        isForBid = false
+                    }
+                }
+            }
+        }
+
         binding.opPercentageLevel.setOnClickListener {
             showSelector {
                 val adapter = ListAdapter.Builder<Selector>().apply {
@@ -407,15 +437,6 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                 return@setOnClickListener
             }
 
-            binding.groupName.text.apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.group_name_hint))
-                    return@setOnClickListener
-                } else {
-                    OASystem.groupOperationRequest.teamName = this.toString()
-                }
-            }
-
             binding.clientName.text.apply {
                 if (isNullOrBlank()) {
                     showMessage(resources.getString(R.string.client_name_hint))
@@ -470,6 +491,15 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
                 }
             }
 
+            binding.groupName.text.apply {
+                if (isNullOrBlank()) {
+                    showMessage(resources.getString(R.string.group_name_hint))
+                    return@setOnClickListener
+                } else {
+                    OASystem.groupOperationRequest.teamName = this.toString()
+                }
+            }
+
             binding.contractDate.text.apply {
                 if (isNullOrBlank()) {
                     showMessage(resources.getString(R.string.contract_date_hint))
@@ -480,34 +510,42 @@ class GroupInfoBaseFragment : BaseFragment<FragmentGroupInfoBaseBinding>() {
             }
 
             binding.visitDaysBefore.text.apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.day_before_hint))
-                    return@setOnClickListener
-                } else {
-                    OASystem.groupOperationRequest.payDay = this.toString().toInt()
+                if (!isForBid) {
+                    if (isNullOrBlank()) {
+                        showMessage(resources.getString(R.string.day_before_hint))
+                        return@setOnClickListener
+                    } else {
+                        OASystem.groupOperationRequest.payDay = this.toString().toInt()
+                    }
                 }
             }
 
             binding.prePayment.text.apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.pre_payment_hint))
-                    return@setOnClickListener
-                } else {
-                    OASystem.groupOperationRequest.paymentMoney = this.toString().toDouble()
+                if (!isForBid) {
+                    if (isNullOrBlank()) {
+                        showMessage(resources.getString(R.string.pre_payment_hint))
+                        return@setOnClickListener
+                    } else {
+                        OASystem.groupOperationRequest.paymentMoney = this.toString().toDouble()
+                    }
                 }
             }
 
             binding.opPercentageLevel.text.apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.op_percentage_hint))
-                    return@setOnClickListener
+                if (!isForBid) {
+                    if (isNullOrBlank()) {
+                        showMessage(resources.getString(R.string.op_percentage_hint))
+                        return@setOnClickListener
+                    }
                 }
             }
 
             binding.levelIllustrate.text.apply {
-                if (isNullOrBlank()) {
-                    showMessage(resources.getString(R.string.level_illustrate_hint))
-                    return@setOnClickListener
+                if (!isForBid) {
+                    if (isNullOrBlank()) {
+                        showMessage(resources.getString(R.string.level_illustrate_hint))
+                        return@setOnClickListener
+                    }
                 }
             }
 

app/src/main/java/com/pan_american/android/ui/login/LoginActivity.kt

@@ -1,9 +1,10 @@
 package com.pan_american.android.ui.login
 
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import com.pan_american.android.BuildConfig
 import com.pan_american.android.OASystem
 import com.pan_american.android.R
 import com.pan_american.android.base.BaseActivity
@@ -45,8 +46,11 @@ class LoginActivity : BaseActivity<ActivityLoginBinding>() {
 
         binding.loginButton.setText(resources.getString(R.string.login))
 
-        binding.systemInfo.text =
-            String.format(getString(R.string.system_info, BuildConfig.VERSION_NAME))
+        binding.systemInfo.text = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            String.format(getString(R.string.system_info, packageManager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0)).versionName))
+        } else {
+            String.format(getString(R.string.system_info, packageManager.getPackageInfo(packageName, 0).versionName))
+        }
     }
 
     override fun initEvents() {

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

@@ -456,6 +456,57 @@
                     android:textSize="@dimen/text_size_medium" />
             </LinearLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginTop="@dimen/common_padding_huge"
+                android:layout_marginBottom="@dimen/common_padding"
+                android:background="@color/line_color" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/common_padding"
+                android:baselineAligned="false"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:text="@string/is_for_bid"
+                    android:textSize="@dimen/text_size_medium" />
+
+                <RadioGroup
+                    android:id="@+id/is_for_bid"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/is_for_bid_yes"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:text="@string/yes"
+                        android:textColor="@color/text_color" />
+
+                    <RadioButton
+                        android:id="@+id/is_for_bid_no"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/common_padding"
+                        android:background="@drawable/style_radio_button"
+                        android:buttonTint="@color/title_background_color"
+                        android:checked="true"
+                        android:text="@string/no"
+                        android:textColor="@color/text_color" />
+                </RadioGroup>
+            </LinearLayout>
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/line"

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

@@ -455,6 +455,7 @@
     <string name="group_trade_director">本团成单人</string>
     <string name="sales_quotation">销售报价号</string>
     <string name="contract_date">合同日期</string>
+    <string name="is_for_bid">是否用于投标</string>
     <string name="group_type">团组类型</string>
     <string name="client_name">客户名称</string>
     <string name="customer_company">客户单位</string>