From 34ce648102b14eb323ad87722291d58c7b120350 Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sun, 3 Nov 2024 16:51:23 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#12=20=E4=BF=AE=E6=AD=A3=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=8A=A8=E6=80=81=E5=90=8E=EF=BC=8C=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=9A=84item?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/index/tabs/profile/MyProfileViewModel.kt  | 12 +++++++++---
 .../riderpro/ui/index/tabs/profile/ProfileV3.kt  |  1 -
 .../aiosman/riderpro/ui/post/NewPostViewModel.kt | 16 ----------------
 .../aiosman/riderpro/ui/post/PostViewModel.kt    |  2 ++
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt
index 44b06fe..ba9d8c2 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt
@@ -12,12 +12,10 @@ import androidx.paging.Pager
 import androidx.paging.PagingConfig
 import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import cn.jpush.android.api.JPushInterface
+import androidx.paging.filter
 import com.aiosman.riderpro.AppState
 import com.aiosman.riderpro.AppStore
-import com.aiosman.riderpro.JpushService
 import com.aiosman.riderpro.Messaging
-import com.aiosman.riderpro.data.AccountProfile
 import com.aiosman.riderpro.data.AccountService
 import com.aiosman.riderpro.data.AccountServiceImpl
 import com.aiosman.riderpro.data.MomentService
@@ -119,6 +117,14 @@ object MyProfileViewModel : ViewModel() {
         }
     }
 
+    fun deleteMoment(id: Int) {
+        val currentPagingData = _sharedFlow.value
+        val updatedPagingData = currentPagingData.filter { momentItem ->
+            momentItem.id != id
+        }
+        _sharedFlow.value = updatedPagingData
+    }
+
     val bio get() = profile?.bio ?: ""
     val nickName get() = profile?.nickName ?: ""
     val avatar get() = profile?.avatar
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
index 1890c35..9eda753 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
@@ -167,7 +167,6 @@ fun ProfileV3(
                         .height(miniToolbarHeight.dp)
                         // 保持在最低高度和当前高度之间
                         .background(AppColors.decentBackground)
-
                 ) {
                 }
                 // header
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt
index 289ecd4..b7eb8b8 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt
@@ -131,21 +131,6 @@ object NewPostViewModel : ViewModel() {
         val uploadImageList = emptyList<UploadImage>().toMutableList()
         var index = 0
         for (item in imageList) {
-            val cursor = context.contentResolver.query(Uri.parse(item.uri), null, null, null, null)
-//            cursor?.use {
-//                if (it.moveToFirst()) {
-//                    val columnIndex = it.getColumnIndex("_display_name")
-//                    if (columnIndex != -1) {
-//                        val displayName = it.getString(columnIndex)
-//                        val extension = displayName.substringAfterLast(".")
-//                        Log.d("NewPost", "File name: $displayName, extension: $extension")
-//                        // read as file
-//                        val file = uriToFile(context, Uri.parse(item.uri))
-//                        Log.d("NewPost", "File size: ${file.length()}")
-//                        uploadImageList += UploadImage(file, displayName, item.uri, extension)
-//                    }
-//                }
-//            }
             // 保存图片到本地
             FileUtil.bitmapToJPG(context, item.bitmap, UUID.randomUUID().toString())
                 ?.let { savedImageUri ->
@@ -162,7 +147,6 @@ object NewPostViewModel : ViewModel() {
         // 刷新个人动态
         MyProfileViewModel.loadProfile(pullRefresh = true)
         TimelineMomentViewModel.refreshPager()
-
     }
 
     suspend fun init() {
diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt
index 2eb8676..4c8bcab 100644
--- a/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt
+++ b/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt
@@ -16,6 +16,7 @@ import com.aiosman.riderpro.entity.MomentServiceImpl
 import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel
 import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel
 import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList
+import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel
 import kotlinx.coroutines.launch
 
 
@@ -162,6 +163,7 @@ class PostViewModel(
             moment?.let {
                 service.deleteMoment(it.id)
                 TimelineMomentViewModel.deleteMoment(it.id)
+                MyProfileViewModel.deleteMoment(it.id)
             }
             callback()
         }