From 28b91d84121d1fb8144dbc7ffd9b5c70a15445e6 Mon Sep 17 00:00:00 2001 From: yuyl <765782212@qq.com> Date: Tue, 17 Jun 2025 14:41:03 +0800 Subject: [PATCH] veloria three 6.17 commit --- app/build.gradle.kts | 4 +-- .../veloria/now/shortapp/civil/RYAction.kt | 7 ---- .../veloria/now/shortapp/highbits/BIFBase.kt | 3 +- .../qscaleqlog/NMQRepositoryFfmpeg.kt | 34 ++++++++++++------- .../highbits/qscaleqlog/PDeteleResource.kt | 3 +- .../adminSourceid/UColorsAvatarFragment.kt | 10 ++++++ .../avcintraRelock/PlayerBuyDialogFragment.kt | 10 +++--- .../bidirectional/PSVHomeSearchActivity.kt | 30 +++++++++++++++- .../bidirectional/coordinate/JService.kt | 10 ++++++ .../coordinate/VeStoreViewModel.kt | 5 +-- .../shortapp/texturedAsink/VePayResBean.kt | 8 +++++ 11 files changed, 91 insertions(+), 33 deletions(-) create mode 100644 app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePayResBean.kt diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 26a9693..b13c7cb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,8 +17,8 @@ android { applicationId = "com.veloria.now.shortapp" minSdk = 24 targetSdk = 34 - versionCode = 3 - versionName = "1.0.2" + versionCode = 5 + versionName = "1.0.4" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/veloria/now/shortapp/civil/RYAction.kt b/app/src/main/java/com/veloria/now/shortapp/civil/RYAction.kt index f285911..6923d67 100644 --- a/app/src/main/java/com/veloria/now/shortapp/civil/RYAction.kt +++ b/app/src/main/java/com/veloria/now/shortapp/civil/RYAction.kt @@ -480,13 +480,6 @@ object RYAction { val toJson = Gson().toJson(list) getMMKV().putString(JActivityAdapter.PAY_ORDER_PAY_BEAN, toJson) } - fun removeOrder(payReq: VePayBean?) { - val updatedList = getOrder().filterNot { it == payReq } - getMMKV().putString( - JActivityAdapter.PAY_ORDER_PAY_BEAN, - Gson().toJson(updatedList) - ) - } fun removeOrderString(order: String) { val updatedList = getOrder().filterNot { it.order_code == order } diff --git a/app/src/main/java/com/veloria/now/shortapp/highbits/BIFBase.kt b/app/src/main/java/com/veloria/now/shortapp/highbits/BIFBase.kt index 68757a8..ad58ad8 100644 --- a/app/src/main/java/com/veloria/now/shortapp/highbits/BIFBase.kt +++ b/app/src/main/java/com/veloria/now/shortapp/highbits/BIFBase.kt @@ -22,6 +22,7 @@ import com.veloria.now.shortapp.texturedAsink.VeCustomerOrderBean import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean import com.veloria.now.shortapp.texturedAsink.VeNoticeNumBean import com.veloria.now.shortapp.texturedAsink.VePayBean +import com.veloria.now.shortapp.texturedAsink.VePayResBean import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean import com.veloria.now.shortapp.texturedAsink.VeRevolutionsBean import com.veloria.now.shortapp.texturedAsink.VeRewardCoinsBean @@ -225,7 +226,7 @@ interface BIFBase { ): Call> @POST("googlePaid") - fun setGooglePaid(@Body vePayBean: VePayBean?): Call> + fun setGooglePaid(@Body vePayBean: VePayBean?): Call> @GET("getRevolutions") fun getRevolutions( diff --git a/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/NMQRepositoryFfmpeg.kt b/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/NMQRepositoryFfmpeg.kt index c9b2eb3..15d65b9 100644 --- a/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/NMQRepositoryFfmpeg.kt +++ b/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/NMQRepositoryFfmpeg.kt @@ -1,32 +1,32 @@ package com.veloria.now.shortapp.highbits.qscaleqlog import androidx.lifecycle.LiveData -import com.veloria.now.shortapp.newsletter.TStore -import com.veloria.now.shortapp.texturedAsink.SManifestBean -import com.veloria.now.shortapp.texturedAsink.TMainExtractionBean -import com.veloria.now.shortapp.texturedAsink.VModuleManifestBean -import com.veloria.now.shortapp.texturedAsink.ESTimeBean -import com.veloria.now.shortapp.texturedAsink.QVNetworkDashboardBean -import com.veloria.now.shortapp.texturedAsink.GStateBean import com.veloria.now.shortapp.highbits.QGift import com.veloria.now.shortapp.highbits.QGift.handleData import com.veloria.now.shortapp.highbits.QGift.response +import com.veloria.now.shortapp.newsletter.TStore import com.veloria.now.shortapp.texturedAsink.DoLoginBean +import com.veloria.now.shortapp.texturedAsink.ESTimeBean +import com.veloria.now.shortapp.texturedAsink.GStateBean import com.veloria.now.shortapp.texturedAsink.KFAFavoritesInterceptorBean import com.veloria.now.shortapp.texturedAsink.LoginDataBean +import com.veloria.now.shortapp.texturedAsink.QVNetworkDashboardBean +import com.veloria.now.shortapp.texturedAsink.SManifestBean +import com.veloria.now.shortapp.texturedAsink.TMainExtractionBean +import com.veloria.now.shortapp.texturedAsink.VModuleManifestBean +import com.veloria.now.shortapp.texturedAsink.VePayBean +import com.veloria.now.shortapp.texturedAsink.VePayResBean import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationDataBean import com.veloria.now.shortapp.texturedAsink.VeW2aSelfAttributionBean -import kotlin.math.min -import kotlin.math.max class NMQRepositoryFfmpeg { -@Volatile - var gradleRadiusCurrent_list: MutableList = mutableListOf() -@Volatile -private var enewsGradleStatusSize: Double = 5122.0 + @Volatile + var gradleRadiusCurrent_list: MutableList = mutableListOf() + @Volatile + private var enewsGradleStatusSize: Double = 5122.0 private val mainService = QGift.apiService @@ -186,4 +186,12 @@ private var enewsGradleStatusSize: Double = 5122.0 } + private suspend fun googlePaid(vePayBean: VePayBean?) = + mainService.setGooglePaid(vePayBean).response() + + fun setGooglePaid(vePayBean: VePayBean?): LiveData>> = + handleData { + googlePaid(vePayBean) + } + } \ No newline at end of file diff --git a/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/PDeteleResource.kt b/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/PDeteleResource.kt index 944eef1..900265d 100644 --- a/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/PDeteleResource.kt +++ b/app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/PDeteleResource.kt @@ -14,6 +14,7 @@ import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderBean import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderReqBean import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean import com.veloria.now.shortapp.texturedAsink.VePayBean +import com.veloria.now.shortapp.texturedAsink.VePayResBean import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean import com.veloria.now.shortapp.texturedAsink.VeRevolutionsBean import kotlin.math.min @@ -148,7 +149,7 @@ private var loginAdaptStr: String = "dlta" private suspend fun googlePaid(vePayBean: VePayBean?) = videoService.setGooglePaid(vePayBean).response() - fun setGooglePaid(vePayBean: VePayBean?): LiveData>> = + fun setGooglePaid(vePayBean: VePayBean?): LiveData>> = handleData { googlePaid(vePayBean) } diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/UColorsAvatarFragment.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/UColorsAvatarFragment.kt index 7e9d5d3..2c9c3c7 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/UColorsAvatarFragment.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/UColorsAvatarFragment.kt @@ -538,6 +538,16 @@ class UColorsAvatarFragment : JItemServiceFragment = mutableMapOf() loggingY.put("trellis", "retried") diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/PlayerBuyDialogFragment.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/PlayerBuyDialogFragment.kt index dfac3a0..93f9407 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/PlayerBuyDialogFragment.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/PlayerBuyDialogFragment.kt @@ -13,6 +13,7 @@ import android.view.WindowManager import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.android.billingclient.api.AcknowledgePurchaseParams import com.android.billingclient.api.BillingClient @@ -113,7 +114,8 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { } coinAdapter = VeStoreCoinAdapter() - binding?.recyclerCoin?.layoutManager = GridLayoutManager(requireContext(), 3) + binding?.recyclerCoin?.layoutManager = + LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) binding?.recyclerCoin?.adapter = coinAdapter binding?.recyclerCoin?.addItemDecoration(object : RecyclerView.ItemDecoration() { override fun getItemOffsets( @@ -122,8 +124,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { parent: RecyclerView, state: RecyclerView.State ) { - outRect.left = resources.getDimension(R.dimen.dp_5).toInt() - outRect.right = resources.getDimension(R.dimen.dp_5).toInt() + outRect.right = resources.getDimension(R.dimen.dp_10).toInt() outRect.bottom = resources.getDimension(R.dimen.dp_10).toInt() } }) @@ -321,9 +322,6 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { } else { toast(getString(R.string.ve_google_pay_success)) } - if (null != payBeanReq) { - RYAction.removeOrder(payBeanReq) - } EventBus.getDefault() .post(JActivityAdapter.VIDEO_PAY_REFRESH) dismiss() diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/PSVHomeSearchActivity.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/PSVHomeSearchActivity.kt index 4f47da2..7f37629 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/PSVHomeSearchActivity.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/PSVHomeSearchActivity.kt @@ -54,6 +54,11 @@ import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.JServi import com.veloria.now.shortapp.texturedAsink.LoginDataBean import com.veloria.now.shortapp.texturedAsink.VeHomeWatchBean import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.debounce +import kotlinx.coroutines.flow.flow +import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -80,6 +85,7 @@ class PSVHomeSearchActivity : AIXTextActivity( val viewModel: JService by viewModels() private var callbackManager: CallbackManager? = null private var scheduler: ScheduledExecutorService? = Executors.newSingleThreadScheduledExecutor() + private val scope = CoroutineScope(Dispatchers.Main) private fun rawEventShowPositionLatest(): MutableList { var responseRemove = true @@ -257,7 +263,11 @@ class PSVHomeSearchActivity : AIXTextActivity( setAdjustToDetail() } } - + viewModel.restorePaidData.observe(this) { + if (it != null) { + it.data?.order_code?.let { it1 -> RYAction.removeOrderString(it1) } + } + } viewModel.onLineLiveData.observe(this) { } @@ -572,6 +582,22 @@ class PSVHomeSearchActivity : AIXTextActivity( } binding.root.postDelayed({ setNotificationTo() }, 700) + //处理失败订单 + binding.root.postDelayed({ + if (RYAction.getOrder().isNotEmpty()) { + val string = RYAction.getOrder() + scope.launch { + flow { + for (item in string) { + emit(item) + } + }.onEach { item -> + viewModel.setGooglePaid(item) + }.debounce(1000).collect {} + } + } + }, 3000) + } private fun stayPrimaryRecommendSearchToast( @@ -893,6 +919,8 @@ class PSVHomeSearchActivity : AIXTextActivity( ) needSave = true w2aSelfAttribution(clipContent) + RYAction.getMMKV() + .putString(JActivityAdapter.HOME_DDL_URL, "") } } } diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/JService.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/JService.kt index c74012a..30450d2 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/JService.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/JService.kt @@ -8,6 +8,8 @@ import com.veloria.now.shortapp.newsletter.TStore import com.veloria.now.shortapp.texturedAsink.DoLoginBean import com.veloria.now.shortapp.texturedAsink.LoginDataBean import com.veloria.now.shortapp.texturedAsink.SManifestBean +import com.veloria.now.shortapp.texturedAsink.VePayBean +import com.veloria.now.shortapp.texturedAsink.VePayResBean import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationDataBean import com.veloria.now.shortapp.texturedAsink.VeW2aSelfAttributionBean @@ -137,4 +139,12 @@ class JService : SStringsHelp() { repository.setSendReport(message_id, title).observeForever {} } + private val restorePaidLiveData = MutableLiveData?>() + val restorePaidData: MutableLiveData?> get() = restorePaidLiveData + fun setGooglePaid(vePayBean: VePayBean?) { + repository.setGooglePaid(vePayBean).observeForever { result -> + restorePaidLiveData.value = result.getOrNull() + } + } + } \ No newline at end of file diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/VeStoreViewModel.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/VeStoreViewModel.kt index 89a3ae7..a8da23c 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/VeStoreViewModel.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/VeStoreViewModel.kt @@ -8,6 +8,7 @@ import com.veloria.now.shortapp.texturedAsink.KFAFavoritesInterceptorBean import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderBean import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderReqBean import com.veloria.now.shortapp.texturedAsink.VePayBean +import com.veloria.now.shortapp.texturedAsink.VePayResBean import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean @@ -48,8 +49,8 @@ class VeStoreViewModel : SStringsHelp() { } } - private val googlePaidLiveData = MutableLiveData?>() - val googlePaidData: MutableLiveData?> get() = googlePaidLiveData + private val googlePaidLiveData = MutableLiveData?>() + val googlePaidData: MutableLiveData?> get() = googlePaidLiveData fun setGooglePaid(vePayBean: VePayBean?) { repository.setGooglePaid(vePayBean).observeForever { result -> googlePaidLiveData.value = result.getOrNull() diff --git a/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePayResBean.kt b/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePayResBean.kt new file mode 100644 index 0000000..fbcf294 --- /dev/null +++ b/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePayResBean.kt @@ -0,0 +1,8 @@ +package com.veloria.now.shortapp.texturedAsink + +class VePayResBean( + val is_backhaul: Int,//1可以上传 + val money: String,//回传价格 + val order_code: String, + val status: String +) \ No newline at end of file