From 3ef9afca6681bf1185631856ee1853368fc5ff33 Mon Sep 17 00:00:00 2001 From: yuyl <765782212@qq.com> Date: Fri, 27 Jun 2025 10:06:38 +0800 Subject: [PATCH] veloria three 6.27 commit --- app/build.gradle.kts | 4 +- .../veloria/now/shortapp/civil/RYAction.kt | 2 +- .../adminSourceid/GColorsFragment.kt | 1 - .../adminSourceid/UColorsAvatarFragment.kt | 53 +++++++---- .../coordinate/OMNormalInstrumented.kt | 24 ++--- .../avcintraRelock/PlayerBuyDialogFragment.kt | 14 ++- .../avcintraRelock/VipSplashDialog.kt | 4 +- .../bidirectional/MQVAutoWidthActivity.kt | 31 ++++++- .../bidirectional/PSVHomeSearchActivity.kt | 10 +-- .../bidirectional/VeStoreActivity.kt | 25 ++++-- .../coordinate/UKBottomCollection.kt | 7 ++ .../texturedAsink/VePaySettingsBean.kt | 1 + app/src/main/res/layout/activity_ve_store.xml | 77 +++++++++------- .../layout/layout_ve_player_buy_dialog.xml | 87 ++++++++++++------- .../main/res/layout/rbd_store_left_item.xml | 3 +- 15 files changed, 230 insertions(+), 113 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2794105..85a7ec0 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 = 8 - versionName = "1.0.6" + versionCode = 9 + versionName = "1.0.7" 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 4086449..e1612bb 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 @@ -222,7 +222,7 @@ object RYAction { var checkboxM: Int = 5689 - hotsCategory_d2 = MMKV.defaultMMKV() + hotsCategory_d2 = MMKV.mmkvWithID("veloria") } return hotsCategory_d2!! } diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/GColorsFragment.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/GColorsFragment.kt index 34b61f7..91ad753 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/GColorsFragment.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/GColorsFragment.kt @@ -326,7 +326,6 @@ class GColorsFragment : JItemServiceFragment querySubVipProductDetails(it1) } + } else { + if (billingClientMe != null) { + billingClientMe?.endConnection() + billingClientMe = null + System.gc() + } + } + } else { + if (billingClientMe != null) { + billingClientMe?.endConnection() + billingClientMe = null + System.gc() } } } - viewModel.createPayOrderData.observe(this) { + viewModel.createPayOrderLiveData.observe(this) { if (it?.data != null) { order_code = it.data.order_code.toString() vipData?.android_template_id?.let { it1 -> getProduct(it1) } @@ -481,7 +497,7 @@ class UColorsAvatarFragment : JItemServiceFragment) { + private fun setVipSlashDialog() { if (!isFragmentVisible()) { return } - vipSplashDialog = VipSplashDialog(requireContext(), vipBeans).apply { + vipSplashDialog = VipSplashDialog(requireContext()).apply { setOnVipSplashOnClickListener(object : VipSplashDialog.SetVipSplashOnClick { override fun onVipSplash() { @@ -883,7 +899,7 @@ class UColorsAvatarFragment : JItemServiceFragment?>() - val PaySettingsV3: MutableLiveData?> get() = _paySettingsV3 - fun getPaySettingsV3(short_play_id: Int, short_play_video_id: Int) = + private val _paySettingsV3Me = MutableLiveData?>() + val paySettingsV3Me: MutableLiveData?> get() = _paySettingsV3Me + fun getPaySettingsV3Me(short_play_id: Int, short_play_video_id: Int) = repository.getPaySettingsV3(short_play_id,short_play_video_id).observeForever { result -> - _paySettingsV3.value = result.getOrNull() + _paySettingsV3Me.value = result.getOrNull() } - private val createPayOrderLiveData = MutableLiveData?>() - val createPayOrderData: MutableLiveData?> get() = createPayOrderLiveData - fun setCreatePayOrder(createOrderReq: VeCreatePayOrderReqBean) { + private val _createPayOrderLiveData = MutableLiveData?>() + val createPayOrderLiveData: MutableLiveData?> get() = _createPayOrderLiveData + fun setCreatePayOrderMe(createOrderReq: VeCreatePayOrderReqBean) { repository.setCreatePayOrder(createOrderReq).observeForever { result -> - createPayOrderLiveData.value = result.getOrNull() + _createPayOrderLiveData.value = result.getOrNull() } } - private val googlePaidLiveData = MutableLiveData?>() - val googlePaidData: MutableLiveData?> get() = googlePaidLiveData - fun setGooglePaid(vePayBean: VePayBean?) { + private val _googlePaidLiveData = MutableLiveData?>() + val googlePaidLiveData: MutableLiveData?> get() = _googlePaidLiveData + fun setGooglePaidMe(vePayBean: VePayBean?) { repository.setGooglePaid(vePayBean).observeForever { result -> - googlePaidLiveData.value = result.getOrNull() + _googlePaidLiveData.value = result.getOrNull() } } 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 909a131..1e79d5a 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 @@ -9,6 +9,7 @@ import android.os.Bundle import android.text.Html import android.view.Gravity import android.view.View +import android.view.ViewGroup import android.view.WindowManager import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope @@ -93,6 +94,8 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { promise_view_ad = parcelable?.promise_view_ad if (TranslationHelper.getTranslation() != null) { + binding?.tvVipTitle?.text = + "VIP | ".plus(TranslationHelper.getTranslation()?.veloria_store_auto_renew) binding?.tvCoinsText?.text = TranslationHelper.getTranslation()?.veloria_your_coins binding?.tvCoinTitle?.text = TranslationHelper.getTranslation()?.veloria_coin_buy_title binding?.tvUnlockText?.text = TranslationHelper.getTranslation()?.veloria_unlock @@ -211,7 +214,10 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { window?.setGravity(Gravity.BOTTOM) val layoutParams = window?.attributes layoutParams?.width = WindowManager.LayoutParams.MATCH_PARENT - layoutParams?.height = (requireActivity().resources.displayMetrics.heightPixels - requireActivity().resources.getDimension(R.dimen.dp_90)).toInt() + layoutParams?.height = + (requireActivity().resources.displayMetrics.heightPixels - requireActivity().resources.getDimension( + R.dimen.dp_90 + )).toInt() window?.attributes = layoutParams return dialog } @@ -266,6 +272,12 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() { fun observeData() { viewModel.PaySettingsV3.observe(this) { if (it?.data != null) { + if (it.data.sort.isNotEmpty() && it.data.sort[0] == "list_coins") { + val parent = binding?.llCoins?.parent as? ViewGroup + parent?.removeView(binding?.llCoins) + binding?.llList?.addView(binding?.llCoins, 0) + } + if (it.data.list_sub_vip.isNotEmpty()) { vipAdapter?.submitList(it.data.list_sub_vip) binding?.recyclerVip?.visibility = View.VISIBLE diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipSplashDialog.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipSplashDialog.kt index d4c5578..da634dc 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipSplashDialog.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipSplashDialog.kt @@ -22,7 +22,7 @@ import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeVipSplash import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean @SuppressLint("MissingInflatedId") -class VipSplashDialog(context: Context,vipBeans: List) : Dialog(context) { +class VipSplashDialog(context: Context) : Dialog(context) { var setVipSplashOnClick: SetVipSplashOnClick? = null private var vipAdapter: VeVipSplashAdapter? = null @@ -62,8 +62,6 @@ class VipSplashDialog(context: Context,vipBeans: List recyclerView.layoutManager = LinearLayoutManager(context) vipAdapter = VeVipSplashAdapter() recyclerView.adapter = vipAdapter - vipAdapter?.submitList(vipBeans) - ivClose.setOnClickListener { singleOnClick { diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/MQVAutoWidthActivity.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/MQVAutoWidthActivity.kt index 3fe8c02..e568e6e 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/MQVAutoWidthActivity.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/MQVAutoWidthActivity.kt @@ -456,7 +456,7 @@ class MQVAutoWidthActivity : } if (JActivityAdapter.VIDEO_PAY_REFRESH == event) { needRestart = true - viewModel.getUserInfo() + viewModel.getUserInfoTwo() } if (JActivityAdapter.VIDEO_PAY_REFRESH_DISMISS == event) { isBuyShowDialog = false @@ -1959,6 +1959,35 @@ class MQVAutoWidthActivity : } } } + viewModel.userInfoTwo.observe(this) { + it?.data?.let { + RYAction.saveUserInfoBean(it) + if (needRestart) { + if (TranslationHelper.getTranslation() != null) { + binding.layoutLock.tvBalance.text = + TranslationHelper.getTranslation()?.veloria_balance.plus(": ") + .plus(RYAction.getUserInfoBean()?.coin_left_total.toString()) + .plus(TranslationHelper.getTranslation()?.veloria_coins) + .plus(" | ") + .plus(RYAction.getUserInfoBean()?.send_coin_left_total.toString()) + .plus(" ") + .plus(TranslationHelper.getTranslation()?.veloria_bonus) + } else { + binding.layoutLock.tvBalance.text = + "Balance: ".plus(RYAction.getUserInfoBean()?.coin_left_total.toString()) + .plus(" Coins | ") + .plus(RYAction.getUserInfoBean()?.send_coin_left_total.toString()) + .plus(" Bonus") + } + if (RYAction.isVipTo()) { + revolution = "1080" + RYAction.getMMKV().putInt(JActivityAdapter.CONSTANTS_QUALITY, 1080) + EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH) + } + detailRefresh() + } + } + } viewModel.doBuyVideo.observe(this) { it?.data?.let { 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 e31c782..58b4887 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 @@ -950,8 +950,6 @@ class PSVHomeSearchActivity : AIXTextActivity( ) needSave = true w2aSelfAttribution(clipContent) - RYAction.getMMKV() - .putString(JActivityAdapter.HOME_DDL_URL, "") } } } @@ -980,11 +978,11 @@ class PSVHomeSearchActivity : AIXTextActivity( JActivityAdapter.VIDEO_SHORT_PLAY_ID, toInt ) }) - RYAction.getMMKV().getString(JActivityAdapter.HOME_DDL_URL, "") + RYAction.getMMKV().putString(JActivityAdapter.HOME_DDL_URL, "") }, 200) } } else { - RYAction.getMMKV().getString(JActivityAdapter.HOME_DDL_URL, "") + RYAction.getMMKV().putString(JActivityAdapter.HOME_DDL_URL, "") } } }, 1500) @@ -1083,9 +1081,7 @@ class PSVHomeSearchActivity : AIXTextActivity( // setDeeplinkFbApi(facebook_id) } } - singleOnClick { - data?.let { viewModel.setW2aSelfAttribution(it) } - } + data?.let { viewModel.setW2aSelfAttribution(it) } } private fun getFirebaseMessaging() { diff --git a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeStoreActivity.kt b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeStoreActivity.kt index 4e83fb0..2c350ea 100644 --- a/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeStoreActivity.kt +++ b/app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeStoreActivity.kt @@ -4,6 +4,7 @@ import android.graphics.Rect import android.os.Build import android.text.Html import android.view.View +import android.view.ViewGroup import androidx.activity.viewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.GridLayoutManager @@ -46,7 +47,7 @@ import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -class VeStoreActivity : AIXTextActivity() , NOFfmpeg { +class VeStoreActivity : AIXTextActivity(), NOFfmpeg { val viewModel: VeStoreViewModel by viewModels() @@ -74,6 +75,7 @@ class VeStoreActivity : AIXTextActivity= Build.VERSION_CODES.N) { @@ -183,7 +185,7 @@ class VeStoreActivity : AIXTextActivity toast(it1) } - }else { + if (TranslationHelper.getTranslation() != null) { + TranslationHelper.getTranslation()?.veloria_no_restore?.let { it1 -> + toast( + it1 + ) + } + } else { toast("No orders to restore") } } @@ -258,6 +264,11 @@ class VeStoreActivity : AIXTextActivity RYAction.removeOrderString(it1) } if (RYAction.getOrder().size == 0) { @@ -354,7 +365,7 @@ class VeStoreActivity : AIXTextActivity?>() + val userInfoTwo: MutableLiveData?> get() = _userInfoTwo + fun getUserInfoTwo() = + repository.getUserInfo().observeForever { result -> + _userInfoTwo.value = result.getOrNull() + } + private val qualityLiveData = MutableLiveData?>() val qualityData: MutableLiveData?> get() = qualityLiveData fun getQualityData() { diff --git a/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePaySettingsBean.kt b/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePaySettingsBean.kt index 8fa4eb1..05e5ccd 100644 --- a/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePaySettingsBean.kt +++ b/app/src/main/java/com/veloria/now/shortapp/texturedAsink/VePaySettingsBean.kt @@ -1,6 +1,7 @@ package com.veloria.now.shortapp.texturedAsink class VePaySettingsBean( + val sort: List, val list_coins: List, val list_vip: List, val list_sub_vip: List, diff --git a/app/src/main/res/layout/activity_ve_store.xml b/app/src/main/res/layout/activity_ve_store.xml index 548df91..e02f9be 100644 --- a/app/src/main/res/layout/activity_ve_store.xml +++ b/app/src/main/res/layout/activity_ve_store.xml @@ -53,48 +53,69 @@ android:layout_height="match_parent"> + + - - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + - - diff --git a/app/src/main/res/layout/layout_ve_player_buy_dialog.xml b/app/src/main/res/layout/layout_ve_player_buy_dialog.xml index 5d7353a..130e1b3 100644 --- a/app/src/main/res/layout/layout_ve_player_buy_dialog.xml +++ b/app/src/main/res/layout/layout_ve_player_buy_dialog.xml @@ -81,47 +81,72 @@ android:layout_below="@+id/iv_close_dialog" android:layout_marginTop="@dimen/dp_7"> - + android:layout_height="match_parent" + android:orientation="vertical" + > + + - - + /> - + app:layout_constraintTop_toBottomOf="@+id/recycler_vip" + > + + + + + + + - + app:layout_constraintTop_toBottomOf="@+id/ll_coins" /> - + diff --git a/app/src/main/res/layout/rbd_store_left_item.xml b/app/src/main/res/layout/rbd_store_left_item.xml index 3328934..f2e3127 100644 --- a/app/src/main/res/layout/rbd_store_left_item.xml +++ b/app/src/main/res/layout/rbd_store_left_item.xml @@ -12,7 +12,7 @@ android:id="@+id/icon" android:layout_width="20dp" android:layout_height="20dp" - android:layout_marginEnd="4dp" /> + /> android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="end" + android:layout_marginStart="@dimen/dp_4" android:fontFamily="sans-serif-medium" android:maxLines="1" android:textSize="@dimen/sp_13" />