2024-04-22 修改

bug修复:

1. 消息系统bug修复
2. 部分Log打印注释掉
3. 市场客户资料细微调整（筛选后列表无数据不显示原有数据）

app/src/main/java/com/pan_american/android/data/model/resource_management/market_customer/entity/MarketCustomer.kt

@@ -31,4 +31,5 @@ class MarketCustomer {
     var ascribedUser = ArrayList<Int>()
     var ascribedDepartment = ArrayList<Int>()
 
+    var otherInfo = ""
 }

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

@@ -77,7 +77,7 @@ class TCPService: Service() {
 
                 connectionTryCount ++
 
-                Log.e(TAG, e.stackTraceToString())
+//                Log.e(TAG, e.stackTraceToString())
 
                 Log.e(TAG, "Connection failed, try reconnect. Count: $connectionTryCount")
 
@@ -93,7 +93,7 @@ class TCPService: Service() {
                 try {
                     hubConnection.on("ReceiveMessage", { message ->
 
-                        Log.e(TAG,"Get message from server. $message")
+//                        Log.e(TAG,"Get message from server. $message")
 
                         if (!message.contains("已上线")) {
                             when {
@@ -131,7 +131,7 @@ class TCPService: Service() {
                     //发送成功以后，重新建立一个心跳消息
                     handler.postDelayed(heartRunnable, heartSpaceTime * 30)
 
-                    Log.e(TAG, "Send message to server.")
+//                    Log.e(TAG, "Send message to server.")
 
                     heartSpaceTryCount = 0
 
@@ -139,7 +139,7 @@ class TCPService: Service() {
 
                     heartSpaceTryCount ++
 
-                    Log.e(TAG, e.stackTraceToString())
+//                    Log.e(TAG, e.stackTraceToString())
 
                     Log.e(TAG, "Get heartSpase failed，try to reconnect. Count: $heartSpaceTryCount")
 

app/src/main/java/com/pan_american/android/ui/group_op/ground_convey_payment_insert/GroundConveyPaymentDetailActivity.kt

@@ -572,6 +572,16 @@ class GroundConveyPaymentDetailActivity : BaseActivity<ActivityGroundConveyPayme
 
         binding.updateLoading.visibility = View.VISIBLE
 
+//        val file = File(filesDir, "data.txt")
+//        if (file.exists()) {
+//            file.delete()
+//        }
+//        file.createNewFile()
+//        val writer = FileWriter(file)
+//        writer.append(Gson().toJson(updateGroundConveyDetailRequest))
+//        writer.flush()
+//        writer.close()
+
         apiService.updateGroundConveyDetail(updateGroundConveyDetailRequest)
             .enqueue(object : Callback<BaseResponse> {
                 override fun onResponse(

app/src/main/java/com/pan_american/android/ui/message/MessageFragment.kt

@@ -65,6 +65,8 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>() {
                     return@apply
                 }
                 text = taskMessageUnReadCount.toString()
+            } else {
+                visibility = View.GONE
             }
         }
 
@@ -76,6 +78,8 @@ class MessageFragment : BaseFragment<FragmentMessageBinding>() {
                     return@apply
                 }
                 text = groupMessageUnReadCount.toString()
+            } else {
+                visibility = View.GONE
             }
         }
     }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/AddGuideResourceActivity.kt

@@ -64,9 +64,8 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
         if (fromList) {
 
             guideResource = intent.getSerializableExtra("guideResource") as GuideResource
-            initGuideResourceInfo()
-
             binding.commit.text = resources.getString(R.string.update)
+            initGuideResourceInfo()
 
         } else {
 
@@ -237,7 +236,7 @@ class AddGuideResourceActivity : BaseActivity<ActivityAddGuideResourceBinding>()
                 expressionB.isEnabled = false
                 expressionC.isEnabled = false
 
-                commit.visibility = View.GONE
+                commit.text = resources.getString(R.string.back)
             }
         }
     }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/GuideResourceSearchFragment.kt

@@ -55,6 +55,7 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
 
         initAreaSelector()
         initViews()
+
         if (listInit) {
             initEvents()
         }

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

@@ -308,6 +308,7 @@ class MarketCustomerActivity : BaseActivity<ActivityMarketCustomerBinding>() {
 
     private fun initMarketCustomerList(type: Int) {
         if (!listInit) {
+
             apiService.queryNewClientData(marketCustomerRequest)
                 .enqueue(object : Callback<MarketCustomerResponse> {
                     override fun onResponse(
@@ -537,6 +538,9 @@ class MarketCustomerActivity : BaseActivity<ActivityMarketCustomerBinding>() {
         }
 
         pageIndex = 1
+        binding.marketCustomerList.adapter!!.notifyItemRangeRemoved(
+            0, marketCustomerListItemList.size
+        )
         marketCustomerListItemList.clear()
         listInit = false
         initMarketCustomerList(1)

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

@@ -18,7 +18,6 @@ import android.os.IBinder
 import android.os.PowerManager
 import android.os.Process
 import android.provider.Settings
-import android.util.Log
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
@@ -67,7 +66,7 @@ class WorkspaceActivity : BaseActivity<ActivityWorkspaceBinding>() {
         }
 
         override fun onServiceDisconnected(p0: ComponentName?) {
-            Log.e("TCPService", "disconnected")
+//            Log.e("TCPService", "disconnected")
         }
     }
 
@@ -189,6 +188,8 @@ class WorkspaceActivity : BaseActivity<ActivityWorkspaceBinding>() {
                 bride.maxCharacterCount = 3
 
                 bride.verticalOffset = 20
+            } else {
+                binding.navView.removeBadge(R.id.navigation_message)
             }
         }
 
@@ -204,6 +205,9 @@ class WorkspaceActivity : BaseActivity<ActivityWorkspaceBinding>() {
                 bride.maxCharacterCount = 3
 
                 bride.verticalOffset = 20
+
+            } else {
+                binding.navView.removeBadge(R.id.navigation_announcement)
             }
         }
     }

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

@@ -86,7 +86,8 @@
                     android:hint="@string/please_select"
                     android:singleLine="true"
                     android:textColorHint="@color/hint_text_color"
-                    android:textSize="@dimen/text_size_medium" />
+                    android:textSize="@dimen/text_size_medium"
+                    android:textColor="@color/text_color"/>
             </LinearLayout>
 
             <View
@@ -387,7 +388,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/dress_b"
@@ -396,7 +398,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/dress_c"
@@ -405,7 +408,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -444,7 +448,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/awareness_b"
@@ -453,7 +458,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/awareness_c"
@@ -462,7 +468,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -501,7 +508,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/expertise_b"
@@ -510,7 +518,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/expertise_c"
@@ -519,7 +528,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -558,7 +568,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/time_concept_b"
@@ -567,7 +578,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/time_concept_c"
@@ -576,7 +588,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -615,7 +628,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/cooperation_b"
@@ -624,7 +638,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/cooperation_c"
@@ -633,7 +648,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -672,7 +688,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/adaptability_b"
@@ -681,7 +698,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/adaptability_c"
@@ -690,7 +708,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 
@@ -729,7 +748,8 @@
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
                         android:checked="true"
-                        android:text="@string/score_A" />
+                        android:text="@string/score_A"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/expression_b"
@@ -738,7 +758,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_B" />
+                        android:text="@string/score_B"
+                        android:textColor="@color/text_color"/>
 
                     <RadioButton
                         android:id="@+id/expression_c"
@@ -747,7 +768,8 @@
                         android:layout_marginStart="@dimen/common_padding"
                         android:background="@drawable/style_radio_button"
                         android:buttonTint="@color/title_background_color"
-                        android:text="@string/score_C" />
+                        android:text="@string/score_C"
+                        android:textColor="@color/text_color"/>
                 </RadioGroup>
             </LinearLayout>
 

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

@@ -33,7 +33,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/selector_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="400dp"
         android:layout_marginStart="@dimen/common_padding_huge"
         android:layout_marginEnd="@dimen/common_padding_huge"
         android:layout_marginBottom="@dimen/common_padding" />