veloria three 6.25 commit

app/build.gradle.kts

@@ -4,6 +4,9 @@ import java.util.Date
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    id("com.google.gms.google-services")
+    id("com.google.firebase.crashlytics")
+    id("com.google.firebase.firebase-perf")
 }
 
 android {
@@ -14,8 +17,8 @@ android {
         applicationId = "com.veloria.now.shortapp"
         minSdk = 24
         targetSdk = 34
-        versionCode = 5
-        versionName = "1.0.4"
+        versionCode = 8
+        versionName = "1.0.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -98,9 +101,11 @@ dependencies {
     implementation(libs.kotlinx.coroutines.android)
 
     implementation(libs.baserecyclerviewadapterhelper4)
+
     // banner
     implementation(libs.banner)
     implementation(libs.glide)
+    implementation(libs.bannerviewpager)
 
     //utils
     implementation(libs.greenrobot.eventbus)
@@ -134,4 +139,13 @@ dependencies {
     //billing
     implementation(libs.billing)
 
+    //google
+    implementation(platform("com.google.firebase:firebase-bom:32.3.1"))
+    implementation(libs.firebase.messaging.ktx)
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.firebase.analytics.ktx)
+    implementation(libs.firebase.crashlytics)
+    implementation(libs.firebase.perf)
+    implementation(libs.flexbox)
+
 }

app/proguard-rules.pro

@@ -283,4 +283,41 @@
 
 -keep class com.android.billingclient.api.** { *; }
 
--keep class com.gytv.app.ui.data.**{ *; }
+-keep class com.gytv.app.ui.data.**{ *; }
+
+
+-keep class com.adjust.sdk.** { *; }
+-keep class com.google.android.gms.common.ConnectionResult {
+   int SUCCESS;
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
+   com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
+}
+-keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
+   java.lang.String getId();
+   boolean isLimitAdTrackingEnabled();
+}
+
+-keep public class com.android.installreferrer.** { *; }
+
+-keep class com.wang.avi.** { *; }
+-keep class com.wang.avi.indicators.** { *; }
+
+-keep class com.bytedance.sdk.** { *; }
+
+-keep public class com.google.android.gms.** { public protected *; }
+
+-keepattributes SourceFile,LineNumberTable # Keep file names and line numbers.
+-keep public class * extends java.lang.Exception # Optional: Keep custom exceptions.
+
+
+-keep class android.support.v8.renderscript.** { *; }
+-keep class androidx.renderscript.** { *; }
+
+#unity
+-keep class com.google.android.gms.ads.** {public *;}
+-keep class com.google.android.gms.appset.** { *; }
+-keep class com.google.android.gms.tasks.** { *; }
+
+-keep class androidx.recyclerview.widget.**{*;}
+-keep class androidx.viewpager2.widget.**{*;}

app/src/main/AndroidManifest.xml

@@ -9,7 +9,6 @@
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-
     <application
         android:name=".newsletter.XNBackground"
         android:allowBackup="true"
@@ -36,12 +35,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
-            <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.VIEW" />
 
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
 
-            <data android:scheme="veloriaapp" />
+                <data android:scheme="veloriaapp" />
 
             </intent-filter>
 
@@ -89,6 +88,23 @@
             </intent-filter>
         </activity>
 
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@mipmap/ic_launcher" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/black" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="@string/default_notification_channel_id" />
+        <service
+            android:name="com.veloria.now.shortapp.other.MyFirebaseMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

app/src/main/java/com/veloria/now/shortapp/civil/JActivityAdapter.kt

@@ -77,7 +77,7 @@ object JActivityAdapter {
    const val FEEDBACK_URL_INDEX: String = "https://campaign.qjwl168.com/pages/leave/index"
    const val FEEDBACK_URL_LIST: String = "https://campaign.qjwl168.com/pages/leave/list"
    const val FEEDBACK_URL_DETAIL: String = "https://campaign.qjwl168.com/pages/leave/detail"
-   const val REWARDS_URL_DETAIL: String = "https://campaign.qjwl168.com/pages/luckydraw/index"
+   const val REWARDS_URL_DETAIL: String = "https://campaign.qjwl168.com/pages/reward/theme4"
 
     const val FEEDBACK_REQUEST_PERMISSIONS_PHOTO = "FEEDBACK_REQUEST_PERMISSIONS_PHOTO"
     const val FEEDBACK_REQUEST_PERMISSIONS_PHOTO_DETAIL = "FEEDBACK_REQUEST_PERMISSIONS_PHOTO_DETAIL"
@@ -93,6 +93,7 @@ object JActivityAdapter {
     const val HOME_USER_REFRESH = "HOME_USER_REFRESH"
     const val HOME_REFRESH_ME = "HOME_REFRESH_ME"
     const val HOME_LOGIN = "HOME_LOGIN"
+    const val REWARD_LOGIN = "REWARD_LOGIN"
     const val HOME_LEAVE_APP = "HOME_LEAVE_APP"
     const val HOME_ON_LINE = "HOME_ON_LINE"
     const val HOME_DDL_URL = "HOME_DDL_URL"
@@ -101,9 +102,23 @@ object JActivityAdapter {
 
     const val HOME_TYPE_MORE_STATE = "HOME_TYPE_MORE_STATE"
     const val HOME_TYPE_MORE_DATA = "HOME_TYPE_MORE_DATA"
+    var IS_HOME_SET_NOTIFICATIONS: Boolean = false
 
     const val LANGUAGE_TRANSLATES_STRING = "LANGUAGE_TRANSLATES_STRING"
 
     const val PAY_ORDER_PAY_BEAN = "PAY_ORDER_PAY_BEAN"
 
+    const val ACCOUNT_DIALOG_TIME_VIP_SPLASH = "ACCOUNT_DIALOG_TIME_VIP_SPLASH"
+    const val ONE_DAY_IN_MILLIS_VIP = 60 * 60 * 1000L
+
+    const val ACCOUNT_VERSION_CONTROL_TIME =
+        "ACCOUNT_VERSION_CONTROL_TIME"
+    const val ACCOUNT_DIALOG_TIME_NOTIFICATIONS =
+        "ACCOUNT_DIALOG_TIME_NOTIFICATIONS"
+    const val ONE_DAY_IN_MILLIS_DAY = 24 * 60 * 60 * 1000L
+
+    const val ACCOUNT_FIREBASE_TOKEN_REFRESH = "ACCOUNT_FIREBASE_TOKEN_REFRESH"
+
+    const val ACCOUNT_WEB_NOTIFICATION = "ACCOUNT_WEB_NOTIFICATION"
+
 }

app/src/main/java/com/veloria/now/shortapp/civil/REVideoAdapter.kt

@@ -6,6 +6,7 @@ import android.os.Handler
 import android.os.Looper
 import android.widget.Toast
 import androidx.annotation.RequiresApi
+import com.veloria.now.shortapp.civil.JActivityAdapter.ONE_DAY_IN_MILLIS_DAY
 import com.veloria.now.shortapp.newsletter.XNBackground
 import java.text.SimpleDateFormat
 import java.time.Duration
@@ -619,4 +620,28 @@ fun formatNumber(num: Int): String {
         num >= 1000 -> "${(num / 1000.0).dailySeriesShowerFamily(1)}K"
         else -> num.toString()
     }
+}
+
+
+fun setShowVIPSlash(): Boolean {
+    val lastTime =
+        RYAction.getMMKV().getLong(JActivityAdapter.ACCOUNT_DIALOG_TIME_VIP_SPLASH, 0)
+    val currentTime = System.currentTimeMillis()
+
+    return currentTime - lastTime > JActivityAdapter.ONE_DAY_IN_MILLIS_VIP
+}
+
+fun setShowNotifications(): Boolean {
+    val lastTime =
+        RYAction.getMMKV().getLong(JActivityAdapter.ACCOUNT_DIALOG_TIME_NOTIFICATIONS, 0)
+    val currentTime = System.currentTimeMillis()
+
+    return currentTime - lastTime > JActivityAdapter.ONE_DAY_IN_MILLIS_DAY
+}
+
+fun shouldVersionControl(): Boolean {
+    val lastPopupTime = RYAction.getMMKV().getLong(JActivityAdapter.ACCOUNT_VERSION_CONTROL_TIME, 0)
+    val currentTime = System.currentTimeMillis()
+
+    return currentTime - lastPopupTime > ONE_DAY_IN_MILLIS_DAY
 }

app/src/main/java/com/veloria/now/shortapp/civil/RYAction.kt

@@ -474,19 +474,12 @@ object RYAction {
 
     fun saveOrder(payReq: VePayBean) {
         val list = getOrder()
-        if (!list.contains(payReq)) {
+        if (!list.contains(payReq) && payReq.order_code.isNotEmpty()) {
             list.add(payReq)
         }
         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 }

app/src/main/java/com/veloria/now/shortapp/civil/TranslationHelper.kt

@@ -21,7 +21,6 @@ object TranslationHelper {
         return Gson().fromJson(string, VeTranslationBean.Translation::class.java)
     }
 
-
     fun replaces(string: String, new1: String, new2: String): String {
         val replace = string.replace("##", new1)
         return replace.replace("#1#", new2)

app/src/main/java/com/veloria/now/shortapp/civil/VeNotificationHelper.kt

@@ -0,0 +1,41 @@
+package com.veloria.now.shortapp.civil
+
+import android.app.Activity
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+
+object VeNotificationHelper {
+
+    const val VE_NOTIFICATION_REQUEST_CODE: Int = 4001
+
+    fun isNotification(context: Context): Boolean {
+        val manager =
+            context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            true
+        } else {
+            manager.areNotificationsEnabled()
+        }
+    }
+
+    fun setNotification(context: Activity) {
+        val intent = Intent()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            intent.action = "android.settings.APP_NOTIFICATION_SETTINGS"
+            intent.putExtra(
+                "android.provider.extra.APP_PACKAGE",
+                YFHome.getPackageName()
+            )
+            context.startActivityForResult(intent, VE_NOTIFICATION_REQUEST_CODE)
+        } else {
+            intent.action = "android.settings.APPLICATION_DETAILS_SETTINGS"
+            intent.data =
+                Uri.fromParts("package", YFHome.getPackageName(), null)
+            context.startActivityForResult(intent, VE_NOTIFICATION_REQUEST_CODE)
+        }
+    }
+
+}

app/src/main/java/com/veloria/now/shortapp/highbits/BIFBase.kt

@@ -22,10 +22,15 @@ 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
 import com.veloria.now.shortapp.texturedAsink.VeTranslationBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationDataBean
 import com.veloria.now.shortapp.texturedAsink.VeW2aSelfAttributionBean
+import com.veloria.now.shortapp.texturedAsink.VersionControlBean
 import com.veloria.now.shortapp.texturedAsink.XAboutBean
 import retrofit2.Call
 import retrofit2.http.Body
@@ -108,7 +113,6 @@ interface BIFBase {
     @GET("customer/info")
     fun getUserInfo(): Call<TStore<KFAFavoritesInterceptorBean>>
 
-
     @POST("uploadHistorySeconds")
     fun getUploadHistorySeconds(
         @Body uploadVideoHistoryBean: PURLockBean
@@ -222,7 +226,35 @@ interface BIFBase {
     ): Call<TStore<VeCreatePayOrderBean>>
 
     @POST("googlePaid")
-    fun setGooglePaid(@Body vePayBean: VePayBean?): Call<TStore<VePayBean>>
+    fun setGooglePaid(@Body vePayBean: VePayBean?): Call<TStore<VePayResBean>>
 
+    @GET("getRevolutions")
+    fun getRevolutions(
+    ): Call<TStore<VeRevolutionsBean>>
+
+    @POST("customer/uploadNoticeStatus")
+    fun setUploadNoticeStatus(
+        @Body veUploadNotificationBean: VeUploadNotificationBean
+    ): Call<TStore<VeUploadNotificationDataBean>>
+
+    @FormUrlEncoded
+    @POST("customer/firebaseToken")
+    fun setFirebaseToken(
+        @Field("fcm_token") fcm_token: String
+    ): Call<TStore<Any>>
+
+    @POST("openNotify")
+    fun setOpenNotify(
+    ): Call<TStore<Any>>
+
+    @FormUrlEncoded
+    @POST("message/sendReport")
+    fun setSendReport(
+        @Field("message_id") message_id: String,
+        @Field("title") title: String
+    ): Call<TStore<Any>>
+
+    @GET("customer/versionControl")
+    fun getVersionControl(): Call<TStore<VersionControlBean>>
 
 }

app/src/main/java/com/veloria/now/shortapp/highbits/QGift.kt

@@ -1,17 +1,12 @@
 package com.veloria.now.shortapp.highbits
 
-import android.os.Build
 import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.liveData
-import com.veloria.now.shortapp.newsletter.XNBackground.Companion.instance
-import com.veloria.now.shortapp.newsletter.TStore
+import com.tencent.mmkv.BuildConfig
 import com.veloria.now.shortapp.civil.JActivityAdapter
 import com.veloria.now.shortapp.civil.JActivityAdapter.BASE_URL
-import com.veloria.now.shortapp.civil.YFHome
-import com.tencent.mmkv.BuildConfig
-import com.veloria.now.shortapp.civil.RYAction
-import com.veloria.now.shortapp.civil.getCurrentTimeZone
+import com.veloria.now.shortapp.newsletter.TStore
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -25,24 +20,24 @@ import retrofit2.Callback
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.nio.charset.StandardCharsets
 import java.util.concurrent.TimeUnit
+import java.util.regex.Pattern
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
 import kotlin.coroutines.suspendCoroutine
-import java.nio.charset.StandardCharsets
-import java.util.regex.Pattern
-
-import kotlin.math.min
-import kotlin.math.max
 
 @Volatile
-private  var pagerLogoAndroid_mark: Int = 3503
+private var pagerLogoAndroid_mark: Int = 3503
+
 @Volatile
- var listenerFree_sum: Long = 8777L
+var listenerFree_sum: Long = 8777L
+
 @Volatile
-private  var seekAnimatingList: MutableList<Double> = mutableListOf<Double>()
+private var seekAnimatingList: MutableList<Double> = mutableListOf<Double>()
+
 @Volatile
- var vipTransparentExpanded_str: String = "printout"
+var vipTransparentExpanded_str: String = "printout"
 
 
 internal object RGJCollectionSurfaceAfterRecent {
@@ -73,33 +68,36 @@ internal object RGJCollectionSurfaceAfterRecent {
 }
 
 object QGift {
-@Volatile
- var durationBuy_Array: MutableList<Boolean> = mutableListOf<Boolean>()
-@Volatile
- var visibleImgWorkStr: String = "yuvplane"
-@Volatile
- var requestLeft_mark: Int = 5228
+    @Volatile
+    var durationBuy_Array: MutableList<Boolean> = mutableListOf<Boolean>()
 
+    @Volatile
+    var visibleImgWorkStr: String = "yuvplane"
 
+    @Volatile
+    var requestLeft_mark: Int = 5228
 
 
     private val client by lazy {
-            var started6:Double = 8100.0
-             if (started6 == 170.0) {}
+        var started6: Double = 8100.0
+        if (started6 == 170.0) {
+        }
 
 
         OkHttpClient.Builder()
             .connectTimeout(30, TimeUnit.SECONDS)
             .readTimeout(30, TimeUnit.SECONDS)
             .writeTimeout(30, TimeUnit.SECONDS)
+            .addInterceptor(DExtraction())
             .addInterceptor(clearBlack)
             .addInterceptor(XGradleCategories())
-            .addInterceptor(DExtraction())
             .addInterceptor(HttpLoggingInterceptor().apply {
-            var userL:MutableList<String> = mutableListOf<String>()
-     userL.add("reel")
-     userL.add("convert")
-             while (userL.size > 44) { break }
+                var userL: MutableList<String> = mutableListOf<String>()
+                userL.add("reel")
+                userL.add("convert")
+                while (userL.size > 44) {
+                    break
+                }
 
 
                 level = if (BuildConfig.DEBUG)
@@ -112,8 +110,10 @@ object QGift {
     }
 
     val apiService: BIFBase by lazy {
-            var l_heightF:Int = 4538
-             while (l_heightF < 88) { break }
+        var l_heightF: Int = 4538
+        while (l_heightF < 88) {
+            break
+        }
 
 
         Retrofit.Builder()
@@ -125,88 +125,102 @@ object QGift {
     }
 
     private val interceptorCheckbox: Retrofit
-    
- public  fun verticalPriceDimensionHistory(seriesRemove: Int, lightModule: Long, stayCut: Double) :Int {
-     var playfairSize_7:Boolean = true
-     var blackArrangement = 2123.0f
-     var trendMax_9 = 3883.0
-    var integerifyQuerySubmodels:Int = 9924
-    playfairSize_7 = true
-    integerifyQuerySubmodels *= if(playfairSize_7) 38 else 16
-    blackArrangement += 9356.0f
-    trendMax_9 = 6295.0
 
-    return integerifyQuerySubmodels
+    public fun verticalPriceDimensionHistory(
+        seriesRemove: Int,
+        lightModule: Long,
+        stayCut: Double
+    ): Int {
+        var playfairSize_7: Boolean = true
+        var blackArrangement = 2123.0f
+        var trendMax_9 = 3883.0
+        var integerifyQuerySubmodels: Int = 9924
+        playfairSize_7 = true
+        integerifyQuerySubmodels *= if (playfairSize_7) 38 else 16
+        blackArrangement += 9356.0f
+        trendMax_9 = 6295.0
 
-}
+        return integerifyQuerySubmodels
+
+    }
 
 
-fun <T> handleData(apiCall: suspend () -> TStore<T>): LiveData<Result<TStore<T>>> {
+    fun <T> handleData(apiCall: suspend () -> TStore<T>): LiveData<Result<TStore<T>>> {
 
-var strtollBitizen:Int =  this.verticalPriceDimensionHistory(2818,772L,1390.0)
+        var strtollBitizen: Int = this.verticalPriceDimensionHistory(2818, 772L, 1390.0)
 
-      if (strtollBitizen >= 66) {
-             println(strtollBitizen)
-      }
+        if (strtollBitizen >= 66) {
+            println(strtollBitizen)
+        }
 
-println(strtollBitizen)
+        println(strtollBitizen)
 
 
-            var systeml:MutableMap<String,Long> = mutableMapOf<String,Long>()
-     systeml.put("swapper", 705L)
-     systeml.put("cbrt", 676L)
-     systeml.put("affinity", 224L)
-     systeml.put("getter", 541L)
-     systeml.put("acquire", 682L)
-     systeml.put("decbn", 361L)
+        var systeml: MutableMap<String, Long> = mutableMapOf<String, Long>()
+        systeml.put("swapper", 705L)
+        systeml.put("cbrt", 676L)
+        systeml.put("affinity", 224L)
+        systeml.put("getter", 541L)
+        systeml.put("acquire", 682L)
+        systeml.put("decbn", 361L)
 
 
-this.durationBuy_Array = mutableListOf<Boolean>()
+        this.durationBuy_Array = mutableListOf<Boolean>()
 
-   this.visibleImgWorkStr = "subsamp"
+        this.visibleImgWorkStr = "subsamp"
 
-   this.requestLeft_mark = 9187
+        this.requestLeft_mark = 9187
 
 
         return liveData(Dispatchers.IO) {
-            var gradlewY:String = "cuvid"
-             if (gradlewY.length > 73) {}
+            var gradlewY: String = "cuvid"
+            if (gradlewY.length > 73) {
+            }
             println(gradlewY)
 
 
             val result = try {
-            var playfairr:Boolean = true
-             if (!playfairr) {}
-            println(playfairr)
+                var playfairr: Boolean = true
+                if (!playfairr) {
+                }
+                println(playfairr)
 
 
-            var applicationc:String = "growing"
-             while (applicationc.length > 123) { break }
-            println(applicationc)
+                var applicationc: String = "growing"
+                while (applicationc.length > 123) {
+                    break
+                }
+                println(applicationc)
 
 
                 val offsetd = apiCall.invoke()
-            var activej:Int = 9413
-             while (activej <= 84) { break }
-            println(activej)
+                var activej: Int = 9413
+                while (activej <= 84) {
+                    break
+                }
+                println(activej)
 
 
                 if (offsetd.code == 200) {
-            var cloudc:Boolean = false
+                    var cloudc: Boolean = false
 
 
                     Result.success(offsetd)
                 } else {
-            var colorsq:Float = 9972.0f
-             while (colorsq == 76.0f) { break }
-            println(colorsq)
+                    var colorsq: Float = 9972.0f
+                    while (colorsq == 76.0f) {
+                        break
+                    }
+                    println(colorsq)
 
 
                     Result.failure(RuntimeException("Result failure"))
                 }
             } catch (e: Exception) {
-            var lifecyclev:Int = 6918
-             while (lifecyclev > 162) { break }
+                var lifecyclev: Int = 6918
+                while (lifecyclev > 162) {
+                    break
+                }
 
 
                 Result.failure(e)
@@ -214,26 +228,30 @@ this.durationBuy_Array = mutableListOf<Boolean>()
             emit(result)
         }
     }
+
     private val clearBlack = HttpLoggingInterceptor()
-    private const val while_7Scheme = 2000L 
+    private const val while_7Scheme = 2000L
     private var type__kService: Long = 0L
-    private val lock = Any() 
-    private val activeColor = Any() 
+    private val lock = Any()
+    private val activeColor = Any()
 
     init {
-            var buttonS:MutableMap<String,Double> = mutableMapOf<String,Double>()
-     buttonS.put("radfg", 308.0)
-     buttonS.put("origins", 531.0)
-     buttonS.put("albums", 618.0)
-     buttonS.put("temp", 939.0)
-     buttonS.put("hypotheses", 893.0)
-     buttonS.put("memorybarrier", 290.0)
-             while (buttonS.size > 26) { break }
+        var buttonS: MutableMap<String, Double> = mutableMapOf<String, Double>()
+        buttonS.put("radfg", 308.0)
+        buttonS.put("origins", 531.0)
+        buttonS.put("albums", 618.0)
+        buttonS.put("temp", 939.0)
+        buttonS.put("hypotheses", 893.0)
+        buttonS.put("memorybarrier", 290.0)
+        while (buttonS.size > 26) {
+            break
+        }
 
 
         clearBlack.level = HttpLoggingInterceptor.Level.BODY
-            var deletes1:Long = 9049L
-             if (deletes1 == 128L) {}
+        var deletes1: Long = 9049L
+        if (deletes1 == 128L) {
+        }
 
 
         val okHttpClient = OkHttpClient.Builder().connectTimeout(30, TimeUnit.SECONDS)
@@ -242,9 +260,11 @@ this.durationBuy_Array = mutableListOf<Boolean>()
             .addInterceptor(XGradleCategories())
             .addInterceptor(DExtraction())
             .build()
-            var navigatey:Long = 6330L
-             while (navigatey < 83L) { break }
-            println(navigatey)
+        var navigatey: Long = 6330L
+        while (navigatey < 83L) {
+            break
+        }
+        println(navigatey)
 
 
         interceptorCheckbox =
@@ -268,164 +288,197 @@ this.durationBuy_Array = mutableListOf<Boolean>()
         }
     }
 
-    
- public  fun layoutListenerLoadFavoriteResponseProgress() :Long {
-     var paddingForeground:Int = 6984
-     var playerResource = 3187.0
-     var playAgreement:MutableList<Boolean> = mutableListOf<Boolean>()
-     var activityGradle:MutableMap<String,String> = mutableMapOf<String,String>()
-    var unrefcountHeavyLoudspeaker:Long = 6413L
-    paddingForeground += 5851
-    playerResource -= 1555.0
 
-    return unrefcountHeavyLoudspeaker
+    public fun layoutListenerLoadFavoriteResponseProgress(): Long {
+        var paddingForeground: Int = 6984
+        var playerResource = 3187.0
+        var playAgreement: MutableList<Boolean> = mutableListOf<Boolean>()
+        var activityGradle: MutableMap<String, String> = mutableMapOf<String, String>()
+        var unrefcountHeavyLoudspeaker: Long = 6413L
+        paddingForeground += 5851
+        playerResource -= 1555.0
 
-}
+        return unrefcountHeavyLoudspeaker
+
+    }
 
 
-fun getUserAgent(): String {
+    fun getUserAgent(): String {
 
-var kmeansTesselate:Long =  this.layoutListenerLoadFavoriteResponseProgress()
+        var kmeansTesselate: Long = this.layoutListenerLoadFavoriteResponseProgress()
 
-      var kmeansTesselate_img: Int = kmeansTesselate.toInt()
-      if (kmeansTesselate > 53L) {
-             println(kmeansTesselate)
-      }
+        var kmeansTesselate_img: Int = kmeansTesselate.toInt()
+        if (kmeansTesselate > 53L) {
+            println(kmeansTesselate)
+        }
 
-println(kmeansTesselate)
+        println(kmeansTesselate)
 
 
-            var progressr:Int = 8219
+        var progressr: Int = 8219
 
 
-        return System.getProperty(RGJCollectionSurfaceAfterRecent.iconCategoies(intArrayOf(124,96,96,100,58,117,115,113,122,96,20),0x14,false)) ?: ""
+        return System.getProperty(
+            RGJCollectionSurfaceAfterRecent.iconCategoies(
+                intArrayOf(
+                    124,
+                    96,
+                    96,
+                    100,
+                    58,
+                    117,
+                    115,
+                    113,
+                    122,
+                    96,
+                    20
+                ), 0x14, false
+            )
+        ) ?: ""
     }
 
     fun <P> build(serviceClass: Class<P>): P = interceptorCheckbox.create(serviceClass)
 
 
-    
- public  fun alertOverFavoriteBack(stopCut: Double, seekbarAvatar: MutableMap<String,Float>, loggerPath: Float) :Float {
-     var with_q6Categoies:Long = 2078L
-     var resourceCount:Float = 5910.0f
-     var aboutTag = 6657.0
-    var smpteRulesYuvptoyuy:Float = 2160.0f
-    with_q6Categoies = 3495L
-    resourceCount = 5030.0f
-    smpteRulesYuvptoyuy += resourceCount
-    aboutTag *= aboutTag
+    public fun alertOverFavoriteBack(
+        stopCut: Double,
+        seekbarAvatar: MutableMap<String, Float>,
+        loggerPath: Float
+    ): Float {
+        var with_q6Categoies: Long = 2078L
+        var resourceCount: Float = 5910.0f
+        var aboutTag = 6657.0
+        var smpteRulesYuvptoyuy: Float = 2160.0f
+        with_q6Categoies = 3495L
+        resourceCount = 5030.0f
+        smpteRulesYuvptoyuy += resourceCount
+        aboutTag *= aboutTag
 
-    return smpteRulesYuvptoyuy
+        return smpteRulesYuvptoyuy
 
-}
+    }
 
 
-@OptIn(DelicateCoroutinesApi::class)
+    @OptIn(DelicateCoroutinesApi::class)
     suspend fun <T> Call<T>.response(): T {
 
-var freedFreeladdrs = alertOverFavoriteBack(3631.0,mutableMapOf<String,Float>(),2982.0f)
+        var freedFreeladdrs = alertOverFavoriteBack(3631.0, mutableMapOf<String, Float>(), 2982.0f)
 
-      var freedFreeladdrs_tube: Double = freedFreeladdrs.toDouble()
-      if (freedFreeladdrs == 35.0f) {
-             println(freedFreeladdrs)
-      }
+        var freedFreeladdrs_tube: Double = freedFreeladdrs.toDouble()
+        if (freedFreeladdrs == 35.0f) {
+            println(freedFreeladdrs)
+        }
 
-println(freedFreeladdrs)
+        println(freedFreeladdrs)
 
 
-            var androidD:String = "mbfilter"
-             if (androidD == "A") {}
+        var androidD: String = "mbfilter"
+        if (androidD == "A") {
+        }
 
 
         return suspendCoroutine { continuation ->
             enqueue(object : Callback<T> {
-                
- public  fun alertContextDetailed(buyPaint: MutableList<Float>) :MutableMap<String,Float> {
-     var marqueeColors = "timeinterval"
-     var justSelect:Double = 1554.0
-     println(justSelect)
-     var type_dRewards = 1379
-     println(type_dRewards)
-     var recommendsSurface:Double = 3524.0
-    var sigidExtensionTrial:MutableMap<String,Float> = mutableMapOf<String,Float>()
-    sigidExtensionTrial.put("stability", 8752.0f)
-    justSelect = 7646.0
-    sigidExtensionTrial.put("unshiftStoppedInvalidation", 1376.0f)
-    type_dRewards -= 8542
-    sigidExtensionTrial.put("throughNotifyingVariable", 1157.0f)
-    recommendsSurface += 1927.0
-    sigidExtensionTrial.put("writexFormatting", 1684.0f)
 
-    return sigidExtensionTrial
+                public fun alertContextDetailed(buyPaint: MutableList<Float>): MutableMap<String, Float> {
+                    var marqueeColors = "timeinterval"
+                    var justSelect: Double = 1554.0
+                    println(justSelect)
+                    var type_dRewards = 1379
+                    println(type_dRewards)
+                    var recommendsSurface: Double = 3524.0
+                    var sigidExtensionTrial: MutableMap<String, Float> =
+                        mutableMapOf<String, Float>()
+                    sigidExtensionTrial.put("stability", 8752.0f)
+                    justSelect = 7646.0
+                    sigidExtensionTrial.put("unshiftStoppedInvalidation", 1376.0f)
+                    type_dRewards -= 8542
+                    sigidExtensionTrial.put("throughNotifyingVariable", 1157.0f)
+                    recommendsSurface += 1927.0
+                    sigidExtensionTrial.put("writexFormatting", 1684.0f)
 
-}
+                    return sigidExtensionTrial
+
+                }
 
 
-override fun onFailure(call: Call<T>, t: Throwable) {
-var aacdectab_x = mutableListOf<Float>()
+                override fun onFailure(call: Call<T>, t: Throwable) {
+                    var aacdectab_x = mutableListOf<Float>()
 
-var potisionActualized = alertContextDetailed(aacdectab_x)
+                    var potisionActualized = alertContextDetailed(aacdectab_x)
 
-      var potisionActualized_len:Int = potisionActualized.size
-      val _potisionActualizedtemp = potisionActualized.keys.toList()
-      for(index_m in 0 .. _potisionActualizedtemp.size - 1) {
-          val key_index_m = _potisionActualizedtemp.get(index_m)
-          val value_index_m = potisionActualized.get(key_index_m)
-          if (index_m  !=  78) {
-              println(key_index_m)
-              println(value_index_m)
-              break
-          }
-      }
+                    var potisionActualized_len: Int = potisionActualized.size
+                    val _potisionActualizedtemp = potisionActualized.keys.toList()
+                    for (index_m in 0.._potisionActualizedtemp.size - 1) {
+                        val key_index_m = _potisionActualizedtemp.get(index_m)
+                        val value_index_m = potisionActualized.get(key_index_m)
+                        if (index_m != 78) {
+                            println(key_index_m)
+                            println(value_index_m)
+                            break
+                        }
+                    }
 
-println(potisionActualized)
+                    println(potisionActualized)
 
 
                     continuation.resumeWithException(t)
                 }
 
-                
- public  fun plusCenterActiveSchemeArgumentHistory(singleScreen: Long, utilsCenter: Long) :MutableMap<String,Boolean> {
-     var beanContent = 1991.0f
-     println(beanContent)
-     var infoCollection:MutableList<Int> = mutableListOf<Int>()
-     var integerSetup:MutableMap<String,Boolean> = mutableMapOf<String,Boolean>()
-    var strokesReorderingWatchers = mutableMapOf<String,Boolean>()
-         strokesReorderingWatchers.put("point", true)
-     strokesReorderingWatchers.put("libopenjpeg", false)
-    beanContent *= 2730.0f
-    strokesReorderingWatchers.put("robinSubsequent",  if (beanContent > 0.0f) true else false)
-    for(smooth in 0 .. infoCollection.size - 1) {
-        strokesReorderingWatchers.put("unquantProjected", if (infoCollection.get(smooth) > 0) true else false)
-    
-}
-    for(dequote in 0 .. integerSetup.keys.toList().size - 1) {
-        strokesReorderingWatchers.put("net", integerSetup.get(integerSetup.keys.toList()[dequote]) ?: false)
-    
-}
 
-    return strokesReorderingWatchers
+                public fun plusCenterActiveSchemeArgumentHistory(
+                    singleScreen: Long,
+                    utilsCenter: Long
+                ): MutableMap<String, Boolean> {
+                    var beanContent = 1991.0f
+                    println(beanContent)
+                    var infoCollection: MutableList<Int> = mutableListOf<Int>()
+                    var integerSetup: MutableMap<String, Boolean> = mutableMapOf<String, Boolean>()
+                    var strokesReorderingWatchers = mutableMapOf<String, Boolean>()
+                    strokesReorderingWatchers.put("point", true)
+                    strokesReorderingWatchers.put("libopenjpeg", false)
+                    beanContent *= 2730.0f
+                    strokesReorderingWatchers.put(
+                        "robinSubsequent",
+                        if (beanContent > 0.0f) true else false
+                    )
+                    for (smooth in 0..infoCollection.size - 1) {
+                        strokesReorderingWatchers.put(
+                            "unquantProjected",
+                            if (infoCollection.get(smooth) > 0) true else false
+                        )
 
-}
+                    }
+                    for (dequote in 0..integerSetup.keys.toList().size - 1) {
+                        strokesReorderingWatchers.put(
+                            "net",
+                            integerSetup.get(integerSetup.keys.toList()[dequote]) ?: false
+                        )
+
+                    }
+
+                    return strokesReorderingWatchers
+
+                }
 
 
-override fun onResponse(call: Call<T>, response: Response<T>) {
+                override fun onResponse(call: Call<T>, response: Response<T>) {
 
-var actorSlippage = plusCenterActiveSchemeArgumentHistory(6775L,1049L)
+                    var actorSlippage = plusCenterActiveSchemeArgumentHistory(6775L, 1049L)
 
-      var actorSlippage_len:Int = actorSlippage.size
-      val _actorSlippagetemp = actorSlippage.keys.toList()
-      for(index_z in 0 .. _actorSlippagetemp.size - 1) {
-          val key_index_z = _actorSlippagetemp.get(index_z)
-          val value_index_z = actorSlippage.get(key_index_z)
-          if (index_z  >  1) {
-              println(key_index_z)
-              println(value_index_z)
-              break
-          }
-      }
+                    var actorSlippage_len: Int = actorSlippage.size
+                    val _actorSlippagetemp = actorSlippage.keys.toList()
+                    for (index_z in 0.._actorSlippagetemp.size - 1) {
+                        val key_index_z = _actorSlippagetemp.get(index_z)
+                        val value_index_z = actorSlippage.get(key_index_z)
+                        if (index_z > 1) {
+                            println(key_index_z)
+                            println(value_index_z)
+                            break
+                        }
+                    }
 
-println(actorSlippage)
+                    println(actorSlippage)
 
 
                     val suspendNum = call.request().url.toString()

app/src/main/java/com/veloria/now/shortapp/highbits/XGradleCategories.kt

@@ -4,90 +4,104 @@ import okhttp3.Interceptor
 import okhttp3.Response
 import okhttp3.ResponseBody
 import java.io.IOException
-import kotlin.math.min
-import kotlin.math.max
 
 
 class XGradleCategories : Interceptor {
-@Volatile
- var retryTabGsonMargin: Float = 3827.0f
-@Volatile
-private  var splashCategoiesPath_list: MutableList<Int> = mutableListOf<Int>()
-@Volatile
- var jobThemesRoundTag: Int = 6322
-@Volatile
- var baseThemesSelectedIndex: Long = 1531L
+    @Volatile
+    var retryTabGsonMargin: Float = 3827.0f
+
+    @Volatile
+    private var splashCategoiesPath_list: MutableList<Int> = mutableListOf<Int>()
+
+    @Volatile
+    var jobThemesRoundTag: Int = 6322
+
+    @Volatile
+    var baseThemesSelectedIndex: Long = 1531L
 
 
     val EN_STR_TAG = '$'
 
     @kotlin.jvm.Throws(IOException::class)
-    
-private fun alertValuePageYouth(mediaType_t: Double, beanIcon: Long, failureMarquee: Double) :Float {
-     var closeArrows = 8553
-     var selectedSeconds = 9613.0f
-     println(selectedSeconds)
-     var areaLoad = 6034.0
-     var collectTrending = 4793L
-    var reachedColocated:Float = 7345.0f
-    closeArrows *= closeArrows
-    selectedSeconds *= 1598.0f
-    reachedColocated *= selectedSeconds
-    areaLoad -= 6057.0
-    collectTrending *= 301L
 
-    return reachedColocated
+    private fun alertValuePageYouth(
+        mediaType_t: Double,
+        beanIcon: Long,
+        failureMarquee: Double
+    ): Float {
+        var closeArrows = 8553
+        var selectedSeconds = 9613.0f
+        println(selectedSeconds)
+        var areaLoad = 6034.0
+        var collectTrending = 4793L
+        var reachedColocated: Float = 7345.0f
+        closeArrows *= closeArrows
+        selectedSeconds *= 1598.0f
+        reachedColocated *= selectedSeconds
+        areaLoad -= 6057.0
+        collectTrending *= 301L
 
-}
+        return reachedColocated
+
+    }
 
 
-fun removeSalt(data: ByteArray, salt: ByteArray): ByteArray {
+    fun removeSalt(data: ByteArray, salt: ByteArray): ByteArray {
 
-var rlottiePeek:Float =  this.alertValuePageYouth(1343.0,1225L,5580.0)
+        var rlottiePeek: Float = this.alertValuePageYouth(1343.0, 1225L, 5580.0)
 
-      var seek_rlottiePeek: Double = rlottiePeek.toDouble()
-      if (rlottiePeek >= 45.0f) {
-             println(rlottiePeek)
-      }
+        var seek_rlottiePeek: Double = rlottiePeek.toDouble()
+        if (rlottiePeek >= 45.0f) {
+            println(rlottiePeek)
+        }
 
-println(rlottiePeek)
+        println(rlottiePeek)
 
 
-            var size_wg:Long = 1078L
-             while (size_wg > 7L) { break }
-            println(size_wg)
+        var size_wg: Long = 1078L
+        while (size_wg > 7L) {
+            break
+        }
+        println(size_wg)
 
 
         if (salt.isEmpty()) return data
         val apiSeek = mutableListOf<Byte>()
-            var foreground2:String = "pre"
-             if (foreground2 == "N") {}
+        var foreground2: String = "pre"
+        if (foreground2 == "N") {
+        }
 
 
         var vipN = 0
-            var surfaceN:Double = 5826.0
+        var surfaceN: Double = 5826.0
 
 
         val scanAgain = salt.size
-            var text5:Double = 529.0
+        var text5: Double = 529.0
 
 
         data.forEach {
-            var sourceX:String = "banned"
+            var sourceX: String = "banned"
 
 
-            var i_view2:Double = 1291.0
-             while (i_view2 > 0.0) { break }
+            var i_view2: Double = 1291.0
+            while (i_view2 > 0.0) {
+                break
+            }
 
 
             val pointApi = salt[vipN % scanAgain]
-            var fragmentst:Float = 3072.0f
-             while (fragmentst >= 130.0f) { break }
+            var fragmentst: Float = 3072.0f
+            while (fragmentst >= 130.0f) {
+                break
+            }
 
 
             apiSeek.add(calRemoveSalt(it, pointApi))
-            var auto_mr1:Int = 3071
-             while (auto_mr1 < 199) { break }
+            var auto_mr1: Int = 3071
+            while (auto_mr1 < 199) {
+                break
+            }
 
 
             vipN++
@@ -95,203 +109,231 @@ println(rlottiePeek)
         return apiSeek.toByteArray()
     }
 
-    
-private fun socketVisibilityDarkLogicArgument(showBackground: Long, loadRecent: String, pageUtils: MutableList<Long>) :Int {
-     var positionDashboard = "handle"
-     println(positionDashboard)
-     var characterGradle:Float = 5880.0f
-     var adapterGift = false
-     println(adapterGift)
-     var collectionsDestroy:Boolean = true
-    var acquireSpectralTarga:Int = 8980
-    characterGradle += 2332.0f
-    adapterGift = true
-    acquireSpectralTarga += if(adapterGift) 46 else 28
-    collectionsDestroy = true
-    acquireSpectralTarga *= if(collectionsDestroy) 98 else 98
 
-    return acquireSpectralTarga
+    private fun socketVisibilityDarkLogicArgument(
+        showBackground: Long,
+        loadRecent: String,
+        pageUtils: MutableList<Long>
+    ): Int {
+        var positionDashboard = "handle"
+        println(positionDashboard)
+        var characterGradle: Float = 5880.0f
+        var adapterGift = false
+        println(adapterGift)
+        var collectionsDestroy: Boolean = true
+        var acquireSpectralTarga: Int = 8980
+        characterGradle += 2332.0f
+        adapterGift = true
+        acquireSpectralTarga += if (adapterGift) 46 else 28
+        collectionsDestroy = true
+        acquireSpectralTarga *= if (collectionsDestroy) 98 else 98
 
-}
+        return acquireSpectralTarga
+
+    }
 
 
-fun deStrBytes(data: String): ByteArray {
-var slideshow_a = "sines"
-var spring_w = mutableListOf<Long>()
+    fun deStrBytes(data: String): ByteArray {
+        var slideshow_a = "sines"
+        var spring_w = mutableListOf<Long>()
 
-var widthNprobe:Int =  this.socketVisibilityDarkLogicArgument(8539L,slideshow_a,spring_w)
+        var widthNprobe: Int = this.socketVisibilityDarkLogicArgument(8539L, slideshow_a, spring_w)
 
-      println(widthNprobe)
+        println(widthNprobe)
 
-println(widthNprobe)
+        println(widthNprobe)
 
 
-            var resN:MutableList<Int> = mutableListOf<Int>()
-     resN.add(558)
-     resN.add(555)
-     resN.add(289)
-     resN.add(898)
-     resN.add(176)
-     resN.add(183)
-             if (resN.contains(5144)) {}
+        var resN: MutableList<Int> = mutableListOf<Int>()
+        resN.add(558)
+        resN.add(555)
+        resN.add(289)
+        resN.add(898)
+        resN.add(176)
+        resN.add(183)
+        if (resN.contains(5144)) {
+        }
 
 
         if (!data.startsWith(EN_STR_TAG)) {
-            var playv:Int = 2159
-             if (playv >= 138) {}
+            var playv: Int = 2159
+            if (playv >= 138) {
+            }
 
 
             throw IllegalArgumentException("Invalid encoded string")
         }
         val rulesLogic = data.substring(1)
-            var t_centerO:String = "nine"
-             while (t_centerO.length > 141) { break }
-            println(t_centerO)
+        var t_centerO: String = "nine"
+        while (t_centerO.length > 141) {
+            break
+        }
+        println(t_centerO)
 
 
         val resourceZ = rulesLogic.chunked(2).map {
-            var logo9:Double = 810.0
-             if (logo9 <= 48.0) {}
+            var logo9: Double = 810.0
+            if (logo9 <= 48.0) {
+            }
 
- it.toInt(16).toByte() }.toByteArray()
-            var footer3l:Boolean = true
-             while (!footer3l) { break }
+            it.toInt(16).toByte()
+        }.toByteArray()
+        var footer3l: Boolean = true
+        while (!footer3l) {
+            break
+        }
 
 
         return de(resourceZ)
     }
-    
-    
-private fun pastRectNormalInstall(offsetStarted: MutableMap<String,Int>, advertLoad: MutableMap<String,Int>) :MutableMap<String,Boolean> {
-     var footerStart:Int = 9590
-     var stringsRepository:Float = 2566.0f
-     var clipBinding = false
-    var nlstFillsFips = mutableMapOf<String,Boolean>()
-         nlstFillsFips.put("conversions", false)
-     nlstFillsFips.put("libsrt", true)
-     nlstFillsFips.put("atables", false)
-    stringsRepository += 8512.0f
-    nlstFillsFips.put("upcallSafety",  if (stringsRepository > 0.0f) true else false)
-    clipBinding = false
-    nlstFillsFips.put("chunkCursorPostprocres", clipBinding)
-
-    return nlstFillsFips
-
-}
 
 
-fun calRemoveSalt(v: Byte, s: Byte): Byte {
+    private fun pastRectNormalInstall(
+        offsetStarted: MutableMap<String, Int>,
+        advertLoad: MutableMap<String, Int>
+    ): MutableMap<String, Boolean> {
+        var footerStart: Int = 9590
+        var stringsRepository: Float = 2566.0f
+        var clipBinding = false
+        var nlstFillsFips = mutableMapOf<String, Boolean>()
+        nlstFillsFips.put("conversions", false)
+        nlstFillsFips.put("libsrt", true)
+        nlstFillsFips.put("atables", false)
+        stringsRepository += 8512.0f
+        nlstFillsFips.put("upcallSafety", if (stringsRepository > 0.0f) true else false)
+        clipBinding = false
+        nlstFillsFips.put("chunkCursorPostprocres", clipBinding)
 
-var difficultyRearrange:MutableMap<String,Boolean> =  this.pastRectNormalInstall(mutableMapOf<String,Int>(),mutableMapOf<String,Int>())
+        return nlstFillsFips
 
-      val _difficultyRearrangetemp = difficultyRearrange.keys.toList()
-      for(index_d in 0 .. _difficultyRearrangetemp.size - 1) {
-          val key_index_d = _difficultyRearrangetemp.get(index_d)
-          val value_index_d = difficultyRearrange.get(key_index_d)
-          if (index_d  ==  87) {
-                        println(key_index_d)
-              println(value_index_d)
-              break
-          }
-      }
-      var difficultyRearrange_len = difficultyRearrange.size
-
-println(difficultyRearrange)
+    }
 
 
-            var videoi:Double = 4439.0
-             if (videoi < 62.0) {}
+    fun calRemoveSalt(v: Byte, s: Byte): Byte {
+
+        var difficultyRearrange: MutableMap<String, Boolean> =
+            this.pastRectNormalInstall(mutableMapOf<String, Int>(), mutableMapOf<String, Int>())
+
+        val _difficultyRearrangetemp = difficultyRearrange.keys.toList()
+        for (index_d in 0.._difficultyRearrangetemp.size - 1) {
+            val key_index_d = _difficultyRearrangetemp.get(index_d)
+            val value_index_d = difficultyRearrange.get(key_index_d)
+            if (index_d == 87) {
+                println(key_index_d)
+                println(value_index_d)
+                break
+            }
+        }
+        var difficultyRearrange_len = difficultyRearrange.size
+
+        println(difficultyRearrange)
+
+
+        var videoi: Double = 4439.0
+        if (videoi < 62.0) {
+        }
 
 
         return if (v >= s) {
-            var clientk:Double = 2863.0
-             if (clientk <= 31.0) {}
+            var clientk: Double = 2863.0
+            if (clientk <= 31.0) {
+            }
             println(clientk)
 
 
             (v - s).toByte()
         } else {
-            var ballC:MutableList<Long> = mutableListOf<Long>()
-     ballC.add(474L)
-     ballC.add(924L)
-     ballC.add(4L)
-     ballC.add(945L)
-     ballC.add(515L)
+            var ballC: MutableList<Long> = mutableListOf<Long>()
+            ballC.add(474L)
+            ballC.add(924L)
+            ballC.add(4L)
+            ballC.add(945L)
+            ballC.add(515L)
             println(ballC)
 
 
             (0xFF - (s - v) + 1).toByte()
         }
     }
-    
-    
-private fun dismissActivityJob(removeUnit: Int) :Double {
-     var shapeUpload = 7212L
-     var uploadBottom:MutableMap<String,Double> = mutableMapOf<String,Double>()
-     var launcherBbfdebaffd = 393
-    var prevEpzs:Double = 4047.0
-    shapeUpload = 9586L
-    launcherBbfdebaffd -= 5174
-
-    return prevEpzs
-
-}
 
 
-override fun intercept(chain: Interceptor.Chain): Response {
+    private fun dismissActivityJob(removeUnit: Int): Double {
+        var shapeUpload = 7212L
+        var uploadBottom: MutableMap<String, Double> = mutableMapOf<String, Double>()
+        var launcherBbfdebaffd = 393
+        var prevEpzs: Double = 4047.0
+        shapeUpload = 9586L
+        launcherBbfdebaffd -= 5174
 
-var stridebMbaff =  this.dismissActivityJob(2430)
+        return prevEpzs
 
-      println(stridebMbaff)
-
-println(stridebMbaff)
+    }
 
 
-            var displayV:MutableMap<String,Long> = mutableMapOf<String,Long>()
-     displayV.put("sliced", 811L)
-     displayV.put("windowing", 438L)
-     displayV.put("plane", 519L)
-     displayV.put("actor", 397L)
-     displayV.put("strtype", 991L)
-             if (displayV.size > 160) {}
+    override fun intercept(chain: Interceptor.Chain): Response {
+
+        var stridebMbaff = this.dismissActivityJob(2430)
+
+        println(stridebMbaff)
+
+        println(stridebMbaff)
+
+
+        var displayV: MutableMap<String, Long> = mutableMapOf<String, Long>()
+        displayV.put("sliced", 811L)
+        displayV.put("windowing", 438L)
+        displayV.put("plane", 519L)
+        displayV.put("actor", 397L)
+        displayV.put("strtype", 991L)
+        if (displayV.size > 160) {
+        }
 
 
         val dimensx = chain.proceed(chain.request())
-            var type_e3i:MutableMap<String,Long> = mutableMapOf<String,Long>()
-     type_e3i.put("severity", 243L)
-     type_e3i.put("abbr", 708L)
-             while (type_e3i.size > 0) { break }
+        var type_e3i: MutableMap<String, Long> = mutableMapOf<String, Long>()
+        type_e3i.put("severity", 243L)
+        type_e3i.put("abbr", 708L)
+        while (type_e3i.size > 0) {
+            break
+        }
 
 
         return if (dimensx.body != null && dimensx.body!!.contentType() != null && dimensx.code == 200) {
-            var networkb:Long = 8466L
-             while (networkb > 185L) { break }
+            var networkb: Long = 8466L
+            while (networkb > 185L) {
+                break
+            }
 
 
             val modulez = dimensx.body!!.contentType()
-            var vipk:Float = 4875.0f
-             while (vipk == 164.0f) { break }
+            var vipk: Float = 4875.0f
+            while (vipk == 164.0f) {
+                break
+            }
             println(vipk)
 
 
             val jobProgressNavigation = dimensx.body!!.string()
-            var manifestp:Float = 3491.0f
-             while (manifestp <= 70.0f) { break }
+            var manifestp: Float = 3491.0f
+            while (manifestp <= 70.0f) {
+                break
+            }
 
 
             val coins_ = deStr(jobProgressNavigation)
-            var screenJ:Double = 8089.0
-             if (screenJ > 176.0) {}
+            var screenJ: Double = 8089.0
+            if (screenJ > 176.0) {
+            }
             println(screenJ)
 
 
             val instrumentedThemes = ResponseBody.create(modulez, coins_)
-            var httpr:Boolean = true
+            var httpr: Boolean = true
 
 
             dimensx.newBuilder().body(instrumentedThemes).build()
         } else {
-            var resource0:Int = 777
+            var resource0: Int = 777
 
 
 
@@ -299,156 +341,176 @@ println(stridebMbaff)
         }
     }
 
-    
-    
-private fun spanShowerPromiseDelay(navigationCurrent: MutableList<Long>, justMin_b: Long, with_dCurrent: Double) :Double {
-     var agreementCloud = 8265.0f
-     var cornerSecond = 7683.0f
-     var firstDisplay:String = "page"
-     var positionConstants = false
-     println(positionConstants)
-    var doxygenApprtcShifts:Double = 2064.0
-    agreementCloud *= 7743.0f
-    cornerSecond *= 4320.0f
-    positionConstants = false
-    doxygenApprtcShifts *= if(positionConstants) 30 else 41
 
-    return doxygenApprtcShifts
+    private fun spanShowerPromiseDelay(
+        navigationCurrent: MutableList<Long>,
+        justMin_b: Long,
+        with_dCurrent: Double
+    ): Double {
+        var agreementCloud = 8265.0f
+        var cornerSecond = 7683.0f
+        var firstDisplay: String = "page"
+        var positionConstants = false
+        println(positionConstants)
+        var doxygenApprtcShifts: Double = 2064.0
+        agreementCloud *= 7743.0f
+        cornerSecond *= 4320.0f
+        positionConstants = false
+        doxygenApprtcShifts *= if (positionConstants) 30 else 41
 
-}
+        return doxygenApprtcShifts
+
+    }
 
 
-fun deWithSalt(data: ByteArray, salt: ByteArray): ByteArray {
-var fastssim_d:MutableList<Long> = mutableListOf<Long>()
+    fun deWithSalt(data: ByteArray, salt: ByteArray): ByteArray {
+        var fastssim_d: MutableList<Long> = mutableListOf<Long>()
 
-var losslessRetryable =  this.spanShowerPromiseDelay(fastssim_d,3413L,7195.0)
+        var losslessRetryable = this.spanShowerPromiseDelay(fastssim_d, 3413L, 7195.0)
 
-      println(losslessRetryable)
+        println(losslessRetryable)
 
-println(losslessRetryable)
+        println(losslessRetryable)
 
 
-            var menuH9:Boolean = false
-             if (menuH9) {}
+        var menuH9: Boolean = false
+        if (menuH9) {
+        }
 
 
         val loggingc = cxEd(data)
-            var utilk:Boolean = true
-             while (!utilk) { break }
+        var utilk: Boolean = true
+        while (!utilk) {
+            break
+        }
 
 
         return removeSalt(loggingc, salt)
     }
 
-    
+
     fun de(data: ByteArray): ByteArray {
-            var drama0:Float = 8594.0f
+        var drama0: Float = 8594.0f
 
 
-this.retryTabGsonMargin = 8295.0f
+        this.retryTabGsonMargin = 8295.0f
 
-   this.splashCategoiesPath_list = mutableListOf<Int>()
+        this.splashCategoiesPath_list = mutableListOf<Int>()
 
-   this.jobThemesRoundTag = 1180
+        this.jobThemesRoundTag = 1180
 
-   this.baseThemesSelectedIndex = 3881L
+        this.baseThemesSelectedIndex = 3881L
 
 
         if (data.isEmpty()) {
-            var min_46_:MutableMap<String,Double> = mutableMapOf<String,Double>()
-     min_46_.put("mathematics", 485.0)
-     min_46_.put("prefixes", 130.0)
-             while (min_46_.size > 67) { break }
+            var min_46_: MutableMap<String, Double> = mutableMapOf<String, Double>()
+            min_46_.put("mathematics", 485.0)
+            min_46_.put("prefixes", 130.0)
+            while (min_46_.size > 67) {
+                break
+            }
 
 
             return data
         }
         val restartLang = data[0].toInt()
-            var history6:Float = 2147.0f
-             while (history6 < 52.0f) { break }
+        var history6: Float = 2147.0f
+        while (history6 < 52.0f) {
+            break
+        }
 
 
         val constantsAddress = data.slice(1 until 1 + restartLang).toByteArray()
-            var adaptB:Float = 8463.0f
-             if (adaptB == 10.0f) {}
-            println(adaptB)
+        var adaptB: Float = 8463.0f
+        if (adaptB == 10.0f) {
+        }
+        println(adaptB)
 
 
-        return deWithSalt(data.slice(1 + restartLang until data.size).toByteArray(), constantsAddress)
+        return deWithSalt(
+            data.slice(1 + restartLang until data.size).toByteArray(),
+            constantsAddress
+        )
     }
 
-    
-    
-private fun parseLogicSystemQuickArgumentInstall(stringsResponse: String, pagerUnit: Int) :MutableMap<String,Float> {
-     var category_lHttp:Double = 3941.0
-     var apiPadding = mutableListOf<Float>()
-     var lockSearch = "shading"
-     var manualModity = 1236.0
-    var zigzagInflightCopyback:MutableMap<String,Float> = mutableMapOf<String,Float>()
-    category_lHttp *= 9448.0
-    zigzagInflightCopyback.put("serialnoImpBundle", 7598.0f)
-    for(failable in 0 .. apiPadding.size - 1) {
-        zigzagInflightCopyback.put("tabsAlternation", apiPadding.get(failable))
-    
-}
-    manualModity += 5665.0
-    zigzagInflightCopyback.put("interceptorTimeperframe", 8301.0f)
 
-    return zigzagInflightCopyback
+    private fun parseLogicSystemQuickArgumentInstall(
+        stringsResponse: String,
+        pagerUnit: Int
+    ): MutableMap<String, Float> {
+        var category_lHttp: Double = 3941.0
+        var apiPadding = mutableListOf<Float>()
+        var lockSearch = "shading"
+        var manualModity = 1236.0
+        var zigzagInflightCopyback: MutableMap<String, Float> = mutableMapOf<String, Float>()
+        category_lHttp *= 9448.0
+        zigzagInflightCopyback.put("serialnoImpBundle", 7598.0f)
+        for (failable in 0..apiPadding.size - 1) {
+            zigzagInflightCopyback.put("tabsAlternation", apiPadding.get(failable))
 
-}
+        }
+        manualModity += 5665.0
+        zigzagInflightCopyback.put("interceptorTimeperframe", 8301.0f)
+
+        return zigzagInflightCopyback
+
+    }
 
 
-fun cxEd(data: ByteArray): ByteArray {
-var ists_b = "formatter"
+    fun cxEd(data: ByteArray): ByteArray {
+        var ists_b = "formatter"
 
-var strikethroughRechunk =  this.parseLogicSystemQuickArgumentInstall(ists_b,7611)
+        var strikethroughRechunk = this.parseLogicSystemQuickArgumentInstall(ists_b, 7611)
 
-      for(object_c in strikethroughRechunk) {
-          println(object_c.key)
-          println(object_c.value)
-      }
-      var strikethroughRechunk_len = strikethroughRechunk.size
+        for (object_c in strikethroughRechunk) {
+            println(object_c.key)
+            println(object_c.value)
+        }
+        var strikethroughRechunk_len = strikethroughRechunk.size
 
-println(strikethroughRechunk)
+        println(strikethroughRechunk)
 
 
-            var recentj:Double = 9124.0
+        var recentj: Double = 9124.0
 
 
         return data.map {
-            var uploadD:String = "numerify"
-             while (uploadD.length > 1) { break }
+            var uploadD: String = "numerify"
+            while (uploadD.length > 1) {
+                break
+            }
 
- (it.toInt() xor 0xFF).toByte() }.toByteArray()
+            (it.toInt() xor 0xFF).toByte()
+        }.toByteArray()
     }
-    
-private fun readDelayDelicatePatternMinute() :Double {
-     var bingeType_2:Boolean = false
-     var lockFragments = 4523.0
-     var failureBuild = "packet"
-    var libyuvUnboxedSpectra:Double = 7033.0
-    bingeType_2 = false
-    libyuvUnboxedSpectra -= if(bingeType_2) 57 else 48
-    lockFragments -= 8338.0
-    libyuvUnboxedSpectra *= lockFragments
 
-    return libyuvUnboxedSpectra
+    private fun readDelayDelicatePatternMinute(): Double {
+        var bingeType_2: Boolean = false
+        var lockFragments = 4523.0
+        var failureBuild = "packet"
+        var libyuvUnboxedSpectra: Double = 7033.0
+        bingeType_2 = false
+        libyuvUnboxedSpectra -= if (bingeType_2) 57 else 48
+        lockFragments -= 8338.0
+        libyuvUnboxedSpectra *= lockFragments
 
-}
+        return libyuvUnboxedSpectra
+
+    }
 
 
-fun deStr(data: String): String {
+    fun deStr(data: String): String {
 
-var exponentTicks:Double =  this.readDelayDelicatePatternMinute()
+        var exponentTicks: Double = this.readDelayDelicatePatternMinute()
 
-      println(exponentTicks)
+        println(exponentTicks)
 
-println(exponentTicks)
+        println(exponentTicks)
 
 
-            var moveg:Boolean = false
-             if (!moveg) {}
+        var moveg: Boolean = false
+        if (!moveg) {
+        }
 
 
         return String(deStrBytes(data), Charsets.UTF_8)

app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/ANotifications.kt

@@ -8,12 +8,20 @@ import com.veloria.now.shortapp.newsletter.TStore
 import com.veloria.now.shortapp.texturedAsink.DoLoginBean
 import com.veloria.now.shortapp.texturedAsink.KFAFavoritesInterceptorBean
 import com.veloria.now.shortapp.texturedAsink.LanguageBean
+import com.veloria.now.shortapp.texturedAsink.LoginDataBean
 import com.veloria.now.shortapp.texturedAsink.SManifestBean
+import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderBean
+import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderReqBean
 import com.veloria.now.shortapp.texturedAsink.VeCustomerBuyRecordsBean
 import com.veloria.now.shortapp.texturedAsink.VeCustomerOrderBean
 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.VeRewardCoinsBean
 import com.veloria.now.shortapp.texturedAsink.VeTranslationBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationDataBean
 
 
 class ANotifications {
@@ -95,4 +103,60 @@ class ANotifications {
         mainService.getData().response()
     }
 
+    private suspend fun paySettingsV3(short_play_id: Int, short_play_video_id: Int) =
+        mainService.getPaySettingsV3(short_play_id, short_play_video_id).response()
+
+    fun getPaySettingsV3(
+        short_play_id: Int, short_play_video_id: Int
+    ): LiveData<Result<TStore<VePaySettingsBean>>> = handleData {
+        paySettingsV3(short_play_id, short_play_video_id)
+    }
+
+    fun setUploadNoticeStatus(veUploadNotificationBean: VeUploadNotificationBean): LiveData<Result<TStore<VeUploadNotificationDataBean>>> =
+        handleData {
+            mainService.setUploadNoticeStatus(veUploadNotificationBean)
+                .response()
+        }
+
+    private suspend fun firebaseToken(fcm_token: String) =
+        mainService.setFirebaseToken(fcm_token).response()
+
+    fun setFirebaseToken(fcm_token: String): LiveData<Result<TStore<Any>>> = handleData {
+        firebaseToken(fcm_token)
+    }
+
+    fun setOpenNotify(): LiveData<Result<TStore<Any>>> =
+        handleData {
+            mainService.setOpenNotify().response()
+        }
+
+    private suspend fun createPayOrder(createOrderReq: VeCreatePayOrderReqBean) =
+        mainService.setCreatePayOrder(createOrderReq).response()
+
+    fun setCreatePayOrder(createOrderReq: VeCreatePayOrderReqBean): LiveData<Result<TStore<VeCreatePayOrderBean>>> =
+        handleData {
+            createPayOrder(createOrderReq)
+        }
+
+    private suspend fun googlePaid(vePayBean: VePayBean?) =
+        mainService.setGooglePaid(vePayBean).response()
+
+    fun setGooglePaid(vePayBean: VePayBean?): LiveData<Result<TStore<VePayResBean>>> =
+        handleData {
+            googlePaid(vePayBean)
+        }
+
+    private suspend fun setLogin(loginDataBean: LoginDataBean) =
+        mainService.setLogin(loginDataBean).response()
+
+    fun setDoLogin(loginDataBean: LoginDataBean): LiveData<Result<TStore<DoLoginBean>>> =
+        handleData {
+            setLogin(loginDataBean)
+        }
+
+    fun setLeaveApp(
+    ): LiveData<Result<TStore<Any>>> =
+        handleData {
+            mainService.setLeaveApp().response()
+        }
 }

app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/NMQRepositoryFfmpeg.kt

@@ -1,30 +1,33 @@
 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
+import com.veloria.now.shortapp.texturedAsink.VersionControlBean
 
 
 class NMQRepositoryFfmpeg {
-@Volatile
- var gradleRadiusCurrent_list: MutableList<String> = mutableListOf<String>()
-@Volatile
-private  var enewsGradleStatusSize: Double = 5122.0
+    @Volatile
+    var gradleRadiusCurrent_list: MutableList<String> = mutableListOf<String>()
 
+    @Volatile
+    private var enewsGradleStatusSize: Double = 5122.0
 
 
     private val mainService = QGift.apiService
@@ -156,4 +159,45 @@ private  var enewsGradleStatusSize: Double = 5122.0
     fun getUserInfo(): LiveData<Result<TStore<KFAFavoritesInterceptorBean>>> = handleData {
         vibrateFragmentManifestRectScreen()
     }
+
+    fun setUploadNoticeStatus(veUploadNotificationBean: VeUploadNotificationBean): LiveData<Result<TStore<VeUploadNotificationDataBean>>> =
+        handleData {
+            mainService.setUploadNoticeStatus(veUploadNotificationBean)
+                .response()
+        }
+
+
+    private suspend fun firebaseToken(fcm_token: String) =
+        mainService.setFirebaseToken(fcm_token).response()
+
+    fun setFirebaseToken(fcm_token: String): LiveData<Result<TStore<Any>>> = handleData {
+        firebaseToken(fcm_token)
+    }
+
+    fun setOpenNotify(): LiveData<Result<TStore<Any>>> =
+        handleData {
+            mainService.setOpenNotify().response()
+        }
+
+    fun setSendReport(
+        message_id: String, title: String
+    ): LiveData<Result<TStore<Any>>> =
+        handleData {
+            mainService.setSendReport(message_id, title).response()
+        }
+
+
+    private suspend fun googlePaid(vePayBean: VePayBean?) =
+        mainService.setGooglePaid(vePayBean).response()
+
+    fun setGooglePaid(vePayBean: VePayBean?): LiveData<Result<TStore<VePayResBean>>> =
+        handleData {
+            googlePaid(vePayBean)
+        }
+
+    fun getVersionControl(
+    ): LiveData<Result<TStore<VersionControlBean>>> =
+        handleData {
+            mainService.getVersionControl().response()
+        }
 }

app/src/main/java/com/veloria/now/shortapp/highbits/qscaleqlog/PDeteleResource.kt

@@ -8,13 +8,17 @@ import com.veloria.now.shortapp.texturedAsink.XAboutBean
 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.texturedAsink.DoLoginBean
 import com.veloria.now.shortapp.texturedAsink.KFAFavoritesInterceptorBean
+import com.veloria.now.shortapp.texturedAsink.LoginDataBean
 import com.veloria.now.shortapp.texturedAsink.VeBuyVideoBean
 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
 import kotlin.math.max
 
@@ -147,7 +151,7 @@ private  var loginAdaptStr: String = "dlta"
     private suspend fun googlePaid(vePayBean: VePayBean?) =
         videoService.setGooglePaid(vePayBean).response()
 
-    fun setGooglePaid(vePayBean: VePayBean?): LiveData<Result<TStore<VePayBean>>> =
+    fun setGooglePaid(vePayBean: VePayBean?): LiveData<Result<TStore<VePayResBean>>> =
         handleData {
             googlePaid(vePayBean)
         }
@@ -158,4 +162,23 @@ private  var loginAdaptStr: String = "dlta"
     fun getUserInfo(): LiveData<Result<TStore<KFAFavoritesInterceptorBean>>> = handleData {
         vibrateFragmentManifestRectScreen()
     }
+
+    fun getQualityData(): LiveData<Result<TStore<VeRevolutionsBean>>> = handleData {
+        videoService.getRevolutions()
+            .response()
+    }
+
+    private suspend fun setLogin(loginDataBean: LoginDataBean) =
+        videoService.setLogin(loginDataBean).response()
+
+    fun setDoLogin(loginDataBean: LoginDataBean): LiveData<Result<TStore<DoLoginBean>>> =
+        handleData {
+            setLogin(loginDataBean)
+        }
+
+    fun setLeaveApp(
+    ): LiveData<Result<TStore<Any>>> =
+        handleData {
+            videoService.setLeaveApp().response()
+        }
 }

app/src/main/java/com/veloria/now/shortapp/other/MyFirebaseMessagingService.kt

@@ -0,0 +1,234 @@
+package com.veloria.now.shortapp.other
+
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.media.RingtoneManager
+import android.os.Build
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import androidx.work.OneTimeWorkRequest
+import androidx.work.WorkManager
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.subtractionCroll.bidirectional.PSVHomeSearchActivity
+import org.greenrobot.eventbus.EventBus
+
+class MyFirebaseMessagingService  : FirebaseMessagingService() {
+
+    private var notificationId: Int = 0
+
+    // [START receive_message]
+    override fun onMessageReceived(remoteMessage: RemoteMessage) {
+        // Not getting messages here? See why this may be: https://goo.gl/39bRNJ
+        Log.d(TAG, "From: ${remoteMessage.from}")
+
+        // Check if message contains a data payload.
+//        if (remoteMessage.data.isNotEmpty()) {
+        // Check if data needs to be processed by long running job
+//            if (needsToBeScheduled()) {
+//                // For long-running tasks (10 seconds or more) use WorkManager.
+//                scheduleJob()
+//            } else {
+//                // Handle message within 10 seconds
+//                handleNow()
+//            }
+//        }
+        Log.d(TAG, "Message data payload: ${remoteMessage.data}")
+        // Check if message contains a notification payload.
+//        remoteMessage.notification?.let {
+//            Log.d(TAG, "Message Notification Body: ${it.body}")
+//
+//        }
+//        if (ExampleApplication.isAppInBackground) {
+        sendNotification(remoteMessage.data)
+//        }
+        // Also if you intend on generating your own notifications as a result of a received FCM
+        // message, here is where that should be initiated. See sendNotification method below.
+    }
+
+    private fun needsToBeScheduled() = true
+
+    // [START on_new_token]
+    /**
+     * Called if the FCM registration token is updated. This may occur if the security of
+     * the previous token had been compromised. Note that this is called when the
+     * FCM registration token is initially generated so this is where you would retrieve the token.
+     */
+    override fun onNewToken(token: String) {
+        Log.d(TAG, "Refreshed token: $token")
+
+        // If you want to send messages to this application instance or
+        // manage this apps subscriptions on the server side, send the
+        // FCM registration token to your app server.
+        sendRegistrationToServer(token)
+    }
+    // [END on_new_token]
+
+    private fun scheduleJob() {
+        // [START dispatch_job]
+        val work = OneTimeWorkRequest.Builder(MyWorker::class.java)
+            .build()
+        WorkManager.getInstance(this)
+            .beginWith(work)
+            .enqueue()
+        // [END dispatch_job]
+    }
+
+    private fun handleNow() {
+        Log.d(TAG, "Short lived task is done.")
+    }
+
+    private fun sendRegistrationToServer(token: String?) {
+        Log.d(TAG, "sendRegistrationTokenToServer($token)")
+        EventBus.getDefault()
+            .post(JActivityAdapter.ACCOUNT_FIREBASE_TOKEN_REFRESH)
+    }
+
+    private fun sendNotification(
+        data: MutableMap<String, String>
+    ) {
+        val intent = Intent(this, PSVHomeSearchActivity::class.java)
+        var title = ""
+        var messageBody = ""
+        var poster = ""
+        if (data.isNotEmpty()) {
+            if (data.containsKey("message_title")) {
+                title = data["message_title"].toString()
+                intent.putExtra("title", title)
+            }
+            if (data.containsKey("message_body")) {
+                messageBody = data["message_body"].toString()
+            }
+            if (data.containsKey("message_id")) {
+                val message_id = data["message_id"]
+                intent.putExtra("message_id", message_id)
+            }
+            if (data.containsKey("path")) {
+                when (data["path"]) {
+                    "detail" -> {
+                        if (data.containsKey("short_play_id")) {
+                            val short_play_id = data["short_play_id"]
+                            intent.putExtra("short_play_id", short_play_id)
+                        }
+                        intent.putExtra("path", "detail")
+                    }
+
+                    "promotion" -> {
+                        intent.putExtra("path", "promotion")
+                    }
+
+                    "orderDetail" -> {
+                        intent.putExtra("path", "orderDetail")
+                    }
+
+                    "feedback" -> {
+                        intent.putExtra("path", "feedback")
+                    }
+                }
+            }
+            if (data.containsKey("poster")) {
+                poster = data["poster"].toString()
+                Glide.with(this)
+                    .asBitmap()
+                    .load(poster)
+                    .into(object : CustomTarget<Bitmap?>() {
+                        override fun onResourceReady(
+                            resource: Bitmap,
+                            transition: Transition<in Bitmap?>?
+                        ) {
+                            setNotification(intent, title, messageBody, resource)
+                        }
+
+                        override fun onLoadFailed(errorDrawable: Drawable?) {
+                            super.onLoadFailed(errorDrawable)
+                            setNotification(intent, title, messageBody, null)
+                        }
+
+                        override fun onLoadCleared(placeholder: Drawable?) {
+
+                        }
+                    })
+            } else {
+                setNotification(intent, title, messageBody, null)
+            }
+        }
+    }
+
+    private fun setNotification(
+        intent: Intent,
+        title: String,
+        messageBody: String,
+        resource: Bitmap?
+    ) {
+        val pendingIntent = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        } else {
+            PendingIntent.getActivity(
+                this,
+                0,
+                intent,
+                PendingIntent.FLAG_UPDATE_CURRENT
+            )
+        }
+        val channelId = getString(R.string.default_notification_channel_id)
+        val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+        val notificationBuilder = if (resource != null) NotificationCompat.Builder(this, channelId)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle(title)
+            .setContentText(messageBody)
+            .setAutoCancel(true)
+            .setSound(defaultSoundUri)
+            .setLargeIcon(resource)
+            .setContentIntent(pendingIntent) else NotificationCompat.Builder(this, channelId)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setContentTitle(title)
+            .setContentText(messageBody)
+            .setAutoCancel(true)
+            .setSound(defaultSoundUri)
+            .setContentIntent(pendingIntent)
+
+        val notificationManager =
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+
+        // Since android Oreo notification channel is needed.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val channel = NotificationChannel(
+                channelId,
+                getString(R.string.default_notification_channel_id),
+                NotificationManager.IMPORTANCE_DEFAULT,
+            )
+            notificationManager.createNotificationChannel(channel)
+        }
+        notificationId++
+        notificationManager.notify(notificationId, notificationBuilder.build())
+    }
+
+    companion object {
+        private const val TAG = "MyFirebaseMsgService"
+    }
+
+    internal class MyWorker(appContext: Context, workerParams: WorkerParameters) :
+        Worker(appContext, workerParams) {
+        override fun doWork(): Result {
+            return Result.success()
+        }
+    }
+
+}

app/src/main/java/com/veloria/now/shortapp/other/VeRewardJsBridge.kt

@@ -0,0 +1,65 @@
+package com.veloria.now.shortapp.other
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.webkit.JavascriptInterface
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.RYAction
+import com.veloria.now.shortapp.civil.getCurrentTimeZone
+import com.veloria.now.shortapp.subtractionCroll.bidirectional.MQVAutoWidthActivity
+import com.veloria.now.shortapp.texturedAsink.VeRewardJsBean
+import com.veloria.now.shortapp.texturedAsink.WatchVideoJsonBean
+import org.greenrobot.eventbus.EventBus
+
+class VeRewardJsBridge(private val context: Context) {
+    @JavascriptInterface
+    fun getUserInfo(): String {
+        val jsInfo = VeRewardJsBean(
+            RYAction.getMMKV()
+                .getString(JActivityAdapter.ACCOUNT_TOKEN, "")
+                .toString(),
+            getCurrentTimeZone(),
+            RYAction.getMMKV().getString(JActivityAdapter.ACCOUNT_LANG_KEY, "en")
+                .toString(),
+            "android"
+        )
+        return Gson().toJson(jsInfo)
+    }
+    @JavascriptInterface
+    fun js2app(string: String) {
+        val parser = JsonParser()
+        val rootJson = parser.parse(string) as JsonObject
+        when (rootJson.get("type").asString) {
+            "login" -> {
+                EventBus.getDefault().post(JActivityAdapter.REWARD_LOGIN)
+            }
+
+            "open_notify" -> {
+                EventBus.getDefault().post(JActivityAdapter.ACCOUNT_WEB_NOTIFICATION)
+            }
+
+            "watch_video" -> {
+                val fromJson = Gson().fromJson(string, WatchVideoJsonBean::class.java)
+                context.startActivity(
+                    Intent(
+                        context,
+                        MQVAutoWidthActivity::class.java
+                    ).apply {
+                        putExtra(
+                            JActivityAdapter.VIDEO_SHORT_PLAY_ID,
+                            fromJson.data?.short_play_id
+                        )
+                        putExtra(
+                            JActivityAdapter.VIDEO_ACTIVITY_ID,
+                            fromJson.data?.activity_id
+                        )
+                    })
+            }
+
+        }
+    }
+}

app/src/main/java/com/veloria/now/shortapp/rewards/BannerPlayerView.kt

@@ -0,0 +1,134 @@
+package com.veloria.now.shortapp.rewards
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.Uri
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.FrameLayout
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.media3.common.MediaItem
+import androidx.media3.common.PlaybackException
+import androidx.media3.common.Player
+import androidx.media3.datasource.DataSource
+import androidx.media3.datasource.DefaultDataSourceFactory
+import androidx.media3.exoplayer.DefaultRenderersFactory
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.hls.HlsMediaSource
+import androidx.media3.exoplayer.source.MediaSource
+import androidx.media3.exoplayer.source.ProgressiveMediaSource
+import com.bumptech.glide.Glide
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.BImage
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.toast
+import com.veloria.now.shortapp.databinding.LayoutBannerPlayerBinding
+import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean
+import kotlinx.coroutines.cancel
+
+class BannerPlayerView(context: Context, attrs: AttributeSet?) :
+    FrameLayout(context, attrs) {
+    @SuppressLint("UnsafeOptInUsageError")
+    private var builder = ExoPlayer.Builder(context, BImage(context))
+        .setRenderersFactory(DefaultRenderersFactory(context).setEnableDecoderFallback(true))
+    private var player: ExoPlayer? = builder.build()
+    private var isDragging = false
+    private var ivCover: AppCompatImageView? = null
+
+    init {
+        val inflate =
+            LayoutInflater.from(context)
+                .inflate(R.layout.layout_banner_player, this, true)
+        val explorePlayerViewBinding = LayoutBannerPlayerBinding.bind(inflate)
+        explorePlayerViewBinding.playerView.player = player
+        ivCover = explorePlayerViewBinding.playerView.findViewById(R.id.iv_cover_recommend_detail)
+        player?.addListener(object : Player.Listener {
+            override fun onPlaybackStateChanged(playbackState: Int) {
+                super.onPlaybackStateChanged(playbackState)
+                when (playbackState) {
+                    Player.STATE_BUFFERING -> {
+
+                    }
+
+                    Player.STATE_READY -> {
+                        player?.play()
+                        ivCover?.visibility = View.INVISIBLE
+                    }
+
+                    Player.STATE_ENDED -> {
+                        ivCover?.visibility = View.VISIBLE
+                    }
+
+                    Player.STATE_IDLE -> {
+                    }
+                }
+            }
+
+            override fun onPlayerError(error: PlaybackException) {
+                super.onPlayerError(error)
+                ivCover?.visibility = View.VISIBLE
+            }
+        })
+
+    }
+
+    fun play() {
+        if (player != null){
+            player?.play()
+        }
+    }
+
+    fun pause() {
+        if (player != null){
+            player?.pause()
+        }
+    }
+
+    fun stop() {
+        if (player != null){
+            player?.stop()
+        }
+    }
+
+    fun release() {
+        if (player != null){
+            player?.release()
+            player = null
+        }
+    }
+
+    @SuppressLint("UnsafeOptInUsageError")
+    fun setPlayInfo(dataRes: VeDetailsRecommendBean.ItemDaraBean?) {
+        if (dataRes != null) {
+            ivCover?.let {
+                Glide.with(context).load(dataRes.image_url)
+                    .into(it)
+            }
+            ivCover?.visibility = View.VISIBLE
+            player?.setMediaSource(buildMediaSource(dataRes.video_url))
+            player?.prepare()
+        } else {
+            if (TranslationHelper.getTranslation() != null) {
+                toast(TranslationHelper.getTranslation()?.veloria_video_source_error.toString())
+            } else {
+                toast("There is a problem with the video source")
+            }
+        }
+    }
+
+    @SuppressLint("UnsafeOptInUsageError")
+    private fun buildMediaSource(videoPath: String): MediaSource {
+        val dataSourceFactory: DataSource.Factory = DefaultDataSourceFactory(context, "veloriatv")
+
+        return if (videoPath.endsWith(".m3u8")) {
+            HlsMediaSource.Factory(dataSourceFactory)
+                .createMediaSource(MediaItem.fromUri(Uri.parse(videoPath)))
+        } else {
+            ProgressiveMediaSource.Factory(dataSourceFactory)
+                .createMediaSource(MediaItem.fromUri(Uri.parse(videoPath)))
+        }
+    }
+
+
+}

app/src/main/java/com/veloria/now/shortapp/rewards/PUtilsView.kt

@@ -580,8 +580,7 @@ class PUtilsView(context: Context, attrs: AttributeSet?) :
 
 
 
-            tvSeriesPlayer?.text =
-                "EP.".plus(dataRes.video_info.episode)
+
             var fragment4t: Long = 8643L
             if (fragment4t < 77L) {
             }
@@ -593,10 +592,14 @@ class PUtilsView(context: Context, attrs: AttributeSet?) :
                         TranslationHelper.getTranslation()?.veloria_all_episodes.toString(),
                         dataRes.episode_total.toString()
                     )
+                tvSeriesPlayer?.text = TranslationHelper.replace(TranslationHelper.getTranslation()?.mireo_EP.toString(),dataRes.video_info.episode.toString())
+
+
             } else {
                 tvSeriesPlayerAll?.text =
                     "All ".plus(dataRes.episode_total).plus(" Episodes")
-
+                tvSeriesPlayer?.text =
+                    "EP.".plus(dataRes.video_info.episode)
             }
             var stringD: String = "blocksize"
             while (stringD.length > 148) {

app/src/main/java/com/veloria/now/shortapp/rewards/TOYPlayfairAutoView.kt

@@ -28,6 +28,7 @@ import com.veloria.now.shortapp.civil.BImage
 import com.veloria.now.shortapp.civil.JActivityAdapter
 import com.veloria.now.shortapp.civil.JActivityAdapter.PLAYER_IS_SEEK
 import com.veloria.now.shortapp.civil.JActivityAdapter.PLAYER_LOCK
+import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.formatNumber
 import com.veloria.now.shortapp.civil.formatTimestamp
@@ -66,16 +67,17 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
     private val viewLifecycleScope = MainScope()
     private var isDragging = false
     private var seekbarPlayerController: AppCompatSeekBar? = null
-    private var exampleProgressJob: Job? = null
+    private var progressJob: Job? = null
     private var ivPlayPlayerController: AppCompatImageView? = null
     private var ivCollectionController: AppCompatImageView? = null
     private var ivBackController: AppCompatImageView? = null
     private var ivCover: AppCompatImageView? = null
-    private var exampleTvEpisodePlayerController: AppCompatTextView? = null
+    private var tvCollectionNumController: AppCompatTextView? = null
     private var ivEpisodePlayerController: AppCompatTextView? = null
     private var llEpisode: LinearLayout? = null
-    private var exampleTvCollectionNumController: AppCompatTextView? = null
-    private var exampleTvTitlePlayerController: AppCompatTextView? = null
+    private var ivCollectionNumController: AppCompatTextView? = null
+    private var tvTitlePlayerController: AppCompatTextView? = null
+    private var tvQuality: AppCompatTextView? = null
     private var tv_player_seek_time: AppCompatTextView? = null
     private var loadingLine: UVPlayer? = null
     private var example_iv_share: AppCompatImageView? = null
@@ -151,7 +153,7 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         }
 
 
-        exampleTvEpisodePlayerController =
+        tvCollectionNumController =
             exampleDetailPlayerViewBinding.playerView.findViewById(R.id.tv_episode_player)
         var p_managerB: Boolean = true
         println(p_managerB)
@@ -177,13 +179,13 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         println(listsa)
 
 
-        exampleTvCollectionNumController =
+        ivCollectionNumController =
             exampleDetailPlayerViewBinding.playerView.findViewById(R.id.tv_collection_num)
         var top6: Float = 827.0f
         println(top6)
 
 
-        exampleTvTitlePlayerController =
+        tvTitlePlayerController =
             exampleDetailPlayerViewBinding.playerView.findViewById(R.id.tv_player_title)
         var logicN: MutableList<String> = mutableListOf<String>()
         logicN.add("indefinitely")
@@ -212,6 +214,8 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
 
         example_iv_share =
             exampleDetailPlayerViewBinding.playerView.findViewById(R.id.iv_share_controller)
+        tvQuality =
+            exampleDetailPlayerViewBinding.playerView.findViewById(R.id.tv_quality)
         var interceptv: Long = 6461L
         if (interceptv == 23L) {
         }
@@ -526,7 +530,7 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         }
 
 
-        exampleProgressJob?.cancel()
+        progressJob?.cancel()
         var numE: Long = 5987L
         if (numE <= 157L) {
         }
@@ -561,7 +565,7 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         }
 
 
-        exampleProgressJob = viewLifecycleScope.launch {
+        progressJob = viewLifecycleScope.launch {
             var arrangementO: String = "audiogen"
             if (arrangementO.length > 136) {
             }
@@ -779,14 +783,14 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         }
 
 
-        exampleProgressJob?.cancel()
+        progressJob?.cancel()
         var unitb: Int = 3323
         while (unitb > 110) {
             break
         }
 
 
-        exampleProgressJob = null
+        progressJob = null
         var additionX: Long = 3766L
         if (additionX > 11L) {
         }
@@ -1165,39 +1169,43 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
             }
 
 
-            exampleTvTitlePlayerController?.text = shortVideo.name
+            tvTitlePlayerController?.text = shortVideo.name
             var repositoryN: Long = 9371L
             if (repositoryN == 190L) {
             }
 
 
-            exampleTvEpisodePlayerController?.text =
-                "EP.".plus(episode.episode)
+
             var y_widthv: Float = 508.0f
             if (y_widthv == 30.0f) {
             }
             println(y_widthv)
-
+            val revolution =
+                RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 540).toString()
+            tvQuality?.text = revolution.plus("P")
             if (TranslationHelper.getTranslation() != null) {
                 ivEpisodePlayerController?.text =
                     TranslationHelper.replace(
                         TranslationHelper.getTranslation()?.veloria_all_episodes.toString(),
                         shortVideo.episode_total.toString()
                     )
+                tvCollectionNumController?.text = TranslationHelper.replace(TranslationHelper.getTranslation()?.mireo_EP.toString(),episode.episode.toString())
             } else {
                 ivEpisodePlayerController?.text =
                     "All ".plus(shortVideo.episode_total).plus(" Episodes")
+                tvCollectionNumController?.text =
+                    "EP.".plus(episode.episode)
             }
             var splashB: MutableMap<String, Float> = mutableMapOf<String, Float>()
             splashB.put("dividor", 509.0f)
             splashB.put("tagavr", 760.0f)
 
 
-            exampleTvCollectionNumController?.text = formatNumber(shortVideo.collect_total)
+            ivCollectionNumController?.text = formatNumber(shortVideo.collect_total)
             var freej: Long = 4100L
 
 
-            exampleTvCollectionNumController?.setTextColor(
+            ivCollectionNumController?.setTextColor(
                 if (shortVideo.is_collect) resources.getColor(
                     R.color.listLineActivity
                 ) else resources.getColor(R.color.white)
@@ -1279,6 +1287,10 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
                 EventBus.getDefault()
                     .post(JActivityAdapter.DetailPlayerVieww_CLOSE)
             }
+            tvQuality?.setOnClickListener {
+                EventBus.getDefault()
+                    .post(JActivityAdapter.CONSTANTS_QUALITY)
+            }
         } else {
             var additionJ: Double = 725.0
 
@@ -1332,6 +1344,6 @@ class TOYPlayfairAutoView(context: Context, attrs: AttributeSet?) :
         println(cagetoryU)
 
 
-        exampleProgressJob?.cancel()
+        progressJob?.cancel()
     }
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/GColorsFragment.kt

@@ -15,6 +15,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.JActivityAdapter.CONSTANTS_QUALITY_REFRESH
 import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
@@ -324,8 +325,9 @@ class GColorsFragment : JItemServiceFragment<VpnInterceptorBinding, PWidthClient
 
 
             isQualityRefresh = true
-        }
 
+            restoreRightKeyboardFirstProfileActivity()
+        }
     }
 
 
@@ -371,6 +373,17 @@ class GColorsFragment : JItemServiceFragment<VpnInterceptorBinding, PWidthClient
 
             showComplete()
             binding.viewPagerRecommend.visibility = View.VISIBLE
+//            if (revolution == "1080" && !RYAction.isVipTo()) {
+//                if (RYAction.isTouristTo()){
+//                    RYAction.getMMKV()
+//                        .putInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+//                }else {
+//                    RYAction.getMMKV()
+//                        .putInt(JActivityAdapter.CONSTANTS_QUALITY, 720)
+//                }
+//                revolution = RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 540).toString()
+//            }
+
             viewModel.getExploreRecommends(currentPage, revolution)
         } else {
             var listv: MutableMap<String, String> = mutableMapOf<String, String>()

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/NOEditRegisterFragment.kt

@@ -18,6 +18,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.JActivityAdapter.CONSTANTS_QUALITY_REFRESH
 import com.veloria.now.shortapp.civil.JActivityAdapter.VIDEO_SHORT_PLAY_ID
 import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
@@ -526,7 +527,7 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
         this.buttonMeasureStandArr = mutableListOf<Boolean>()
 
 
-        StatusBarUtil.addStatusBarPadding(binding.textHome)
+//        StatusBarUtil.addStatusBarPadding(binding.textHome)
         var coverP: String = "member"
         if (coverP.length > 87) {
         }
@@ -544,7 +545,7 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
             }
 
 
-            binding.constraint.visibility = View.GONE
+            binding.clRoot.visibility = View.GONE
             var bolda: Int = 5532
             if (bolda == 91) {
             }
@@ -586,6 +587,7 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
             })
             return
         }
+        showComplete()
         EventBus.getDefault().register(this)
         var bbfdebaffdk: Boolean = true
         if (!bbfdebaffdk) {
@@ -594,17 +596,19 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
         if (TranslationHelper.getTranslation() != null) {
             binding.textHome.text =
                 TranslationHelper.getTranslation()?.veloria_addictive_short_await
-            binding.tvMenuBinge.text = TranslationHelper.getTranslation()?.veloria_worthy_picks
             binding.tvMenuDrama.text = TranslationHelper.getTranslation()?.veloria_drama_champions
             binding.tvMenuCategories.text =
                 TranslationHelper.getTranslation()?.veloria_select_categories
             binding.tvMenuCategories1.text =
                 TranslationHelper.getTranslation()?.veloria_select_categories
             binding.tvSearch.text = TranslationHelper.getTranslation()?.veloria_search_dramas
+            binding.tvMoreBinge.text = TranslationHelper.getTranslation()?.veloria_more
+            binding.tvMoreDrama.text = TranslationHelper.getTranslation()?.veloria_more
+            binding.tvMoreFree.text = TranslationHelper.getTranslation()?.veloria_more
+            binding.tvMoreJust.text = TranslationHelper.getTranslation()?.veloria_more
 
         } else {
             binding.textHome.text = getString(R.string.home_addictive_shorts_await)
-            binding.tvMenuBinge.text = getString(R.string.binge_worthy_picks)
             binding.tvMenuDrama.text = getString(R.string.drama_champions)
             binding.tvMenuCategories.text = getString(R.string.select_categories)
             binding.tvMenuCategories1.text = getString(R.string.select_categories)
@@ -623,7 +627,7 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
         println(message6)
 
 
-        binding.constraint.visibility = View.VISIBLE
+        binding.clRoot.visibility = View.VISIBLE
         var viewsL: Long = 2629L
         while (viewsL > 95L) {
             break
@@ -1238,6 +1242,17 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
         viewModel.userInfo.observe(this){
             if (it?.data != null) {
                 RYAction.saveUserInfoBean(it.data)
+
+                if (!RYAction.isVipTo()) {
+                    if (RYAction.isTouristTo()){
+                        RYAction.getMMKV()
+                            .putInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+                    }else {
+                        RYAction.getMMKV()
+                            .putInt(JActivityAdapter.CONSTANTS_QUALITY, 720)
+                    }
+                    EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH)
+                }
             }
         }
 
@@ -1473,7 +1488,7 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
                                 }
                                 println(infoO)
 
-
+                                binding.tvMenuBinge.text = homeTotal.title
                                 homeBingeAdapter?.submitList(homeTotal.list)
                             } else {
                                 var register__9: Double = 7713.0
@@ -1652,12 +1667,10 @@ class NOEditRegisterFragment : JItemServiceFragment<QfAutoBinding, VDLRenderers>
                                 while (helpqb >= 138) {
                                     break
                                 }
-
                                 val maxSize = appearanceBase.size - (appearanceBase.size % 3)
+                                val dramaList = appearanceBase.take(maxSize)
 
-                                val dramaArrayList = appearanceBase.take(maxSize)
-
-                                homeDramaAdapter?.submitList(dramaArrayList)
+                                homeDramaAdapter?.submitList(dramaList)
                             } else {
                                 var loginm: String = "downmix"
                                 while (loginm.length > 104) {

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/UColorsAvatarFragment.kt

@@ -7,6 +7,17 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import com.android.billingclient.api.AcknowledgePurchaseParams
+import com.android.billingclient.api.BillingClient
+import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.ProductDetails
+import com.android.billingclient.api.ProductDetailsResponseListener
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.PurchasesUpdatedListener
+import com.android.billingclient.api.QueryProductDetailsParams
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
@@ -16,25 +27,32 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.JActivityAdapter.CONSTANTS_QUALITY_REFRESH
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.YFHome
+import com.veloria.now.shortapp.civil.setShowVIPSlash
 import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.timeToString
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.EvBodyloadHomeBinding
 import com.veloria.now.shortapp.newsletter.JItemServiceFragment
 import com.veloria.now.shortapp.subtractionCroll.adminSourceid.coordinate.OMNormalInstrumented
-import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.LoginDialog
 import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.LogoutDialog
-import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeLanguageActivity
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.VipSplashDialog
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.RBZLatestDeteleActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.RCheckActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeAccountDeletionActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeFeedbackActivity
+import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeLanguageActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeMyWalletActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeRewardsActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.VeStoreActivity
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.JService
+import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderReqBean
+import com.veloria.now.shortapp.texturedAsink.VePayBean
+import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -188,11 +206,14 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
         if (radiusz.size > 101) {
         }
 
-        if (TranslationHelper.getTranslation() != null){
+        if (TranslationHelper.getTranslation() != null) {
             binding.tvCheckIn.text = TranslationHelper.getTranslation()?.veloria_check_in
-            binding.tvVipContent1.text = TranslationHelper.getTranslation()?.veloria_ad_free_streaming
-            binding.tvVipContent2.text = TranslationHelper.getTranslation()?.veloria_exclusive_episodes
-            binding.tvVipContent3.text = TranslationHelper.getTranslation()?.veloria_daily_free_coins
+            binding.tvVipContent1.text =
+                TranslationHelper.getTranslation()?.veloria_ad_free_streaming
+            binding.tvVipContent2.text =
+                TranslationHelper.getTranslation()?.veloria_exclusive_episodes
+            binding.tvVipContent3.text =
+                TranslationHelper.getTranslation()?.veloria_daily_free_coins
             binding.tvCoinsText.text = TranslationHelper.getTranslation()?.veloria_coins
             binding.tvDonateText.text = TranslationHelper.getTranslation()?.veloria_bonus
             binding.tvWallet.text = TranslationHelper.getTranslation()?.veloria_wallet
@@ -200,39 +221,45 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
             binding.tvRewards.text = TranslationHelper.getTranslation()?.veloria_rewards
             binding.tvRecord.text = TranslationHelper.getTranslation()?.veloria_order_record
             binding.tvLanguage.text = TranslationHelper.getTranslation()?.veloria_language
-            binding.tvDeleteAccount.text = TranslationHelper.getTranslation()?.veloria_delete_account
+            binding.tvDeleteAccount.text =
+                TranslationHelper.getTranslation()?.veloria_delete_account
             binding.tvPrivacyPolicy.text = TranslationHelper.getTranslation()?.veloria_my_privacy
             binding.tvUserAgreement.text = TranslationHelper.getTranslation()?.veloria_my_agreement
             binding.tvVisit.text = TranslationHelper.getTranslation()?.veloria_visit_website
             binding.tvHelpCenter.text = TranslationHelper.getTranslation()?.veloria_my_feedback
             binding.tvAboutUs.text = TranslationHelper.getTranslation()?.veloria_me_about
+            binding.tvFavorites.text = TranslationHelper.getTranslation()?.veloria_favorites
         }
 
         setPushUI()
-
+        setShowVipSlashDialog()
 
     }
 
-    private fun setPushUI(){
+    private fun setPushUI() {
         if (RYAction.isTouristTo()) {
 
-            if (TranslationHelper.getTranslation()!= null){
+            if (TranslationHelper.getTranslation() != null) {
                 binding.tvName.text = TranslationHelper.getTranslation()?.veloria_visitor
                 binding.tvLogin.text = TranslationHelper.getTranslation()?.veloria_login
 
-            }else {
+            } else {
                 binding.tvName.text = "Visitor"
                 binding.tvLogin.text = "Log in"
             }
 
-            binding.ivAvatar.setImageResource(R.mipmap.binge_banner)
+//            binding.ivAvatar.setImageResource(R.mipmap.binge_banner)
+            binding.ivAvatar.let {
+                Glide.with(this).load(R.mipmap.binge_banner).into(it)
+            }
             binding.tvDeleteAccount.visibility = View.GONE
 
         } else {
             binding.tvName.text =
-                RYAction.getUserInfoBean()?.family_name.plus(RYAction.getUserInfoBean()?.giving_name)
+                RYAction.getUserInfoBean()?.family_name
 
-            binding.tvLogin.text = TranslationHelper.getTranslation()?.let { TranslationHelper.getTranslation()?.veloria_log_out } ?: "Log out"
+            binding.tvLogin.text = TranslationHelper.getTranslation()
+                ?.let { TranslationHelper.getTranslation()?.veloria_log_out } ?: "Log out"
 
             binding.ivAvatar.let {
                 Glide.with(this).load(RYAction.getUserInfoBean()?.avator).skipMemoryCache(true)
@@ -254,7 +281,7 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
             RYAction.getUserInfoBean()?.send_coin_left_total.toString()
 
         if (RYAction.isVipTo()) {
-            if (TranslationHelper.getTranslation() != null){
+            if (TranslationHelper.getTranslation() != null) {
 //                binding.tvDes.text = TranslationHelper.getTranslation()?.veloria_welcome_back
                 binding.tvVipName.text = TranslationHelper.getTranslation()?.veloria_vip_active
                 binding.tvVipDes.text =
@@ -263,7 +290,7 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
                             it.toLong()
                         )
                     })
-            }else {
+            } else {
 //                binding.tvDes.text = "Welcome back, Member!"
                 binding.tvVipName.text = "VIP Active"
                 binding.tvVipDes.text =
@@ -275,15 +302,16 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
             }
 
         } else {
-            if (TranslationHelper.getTranslation() != null){
+            if (TranslationHelper.getTranslation() != null) {
 //                binding.tvDes.text = TranslationHelper.getTranslation()?.veloria_is_vip_tips
                 binding.tvVipName.text = TranslationHelper.getTranslation()?.veloria_vip_join
                 binding.tvVipDes.text = TranslationHelper.getTranslation()?.veloria_unlock_exclusive
-            }else {
+            } else {
 //                binding.tvDes.text = getString(R.string.collectIcon)
                 binding.tvVipName.text = "Join VIP"
                 binding.tvVipDes.text = getString(R.string.pagerCategoies)
             }
+
         }
     }
 
@@ -391,11 +419,22 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
 
 
                 setPushUI()
+
+                if (!RYAction.isVipTo()) {
+                    if (RYAction.isTouristTo()) {
+                        RYAction.getMMKV()
+                            .putInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+                    } else {
+                        RYAction.getMMKV()
+                            .putInt(JActivityAdapter.CONSTANTS_QUALITY, 720)
+                    }
+                    EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH)
+                }
             }
 
             hideLoading()
         }
-        viewModel.logoutLiveData.observe(this){
+        viewModel.logoutLiveData.observe(this) {
             if (it?.data != null) {
                 if (TranslationHelper.getTranslation() != null) {
                     toast(TranslationHelper.getTranslation()?.veloria_succeed.toString())
@@ -405,19 +444,63 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
                 LoginManager.getInstance().logOut()
                 RYAction.getMMKV()
                     .putString(JActivityAdapter.ACCOUNT_TOKEN, it.data.token)
-                EventBus.getDefault()
-                    .post(JActivityAdapter.HOME_LEAVE_APP)
                 EventBus.getDefault()
                     .post(JActivityAdapter.HOME_ENTER_THE_APP)
                 EventBus.getDefault()
                     .post(JActivityAdapter.HOME_USER_REFRESH)
-
+//                RYAction.getMMKV()
+//                    .putInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.CONSTANTS_QUALITY_REFRESH)
                 EventBus.getDefault()
                     .post(JActivityAdapter.HOME_NAVIGATE_TO_HOME)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_ON_LINE)
 
             }
         }
+        viewModel.PaySettingsV3.observe(this) {
+            if (it?.data != null) {
+                if (it.data.list_sub_vip.isNotEmpty()) {
+                    setVipSlashDialog(it.data.list_sub_vip)
 
+                    it.data.list_sub_vip.let { it1 -> querySubVipProductDetails(it1) }
+                }
+            }
+        }
+        viewModel.createPayOrderData.observe(this) {
+            if (it?.data != null) {
+                order_code = it.data.order_code.toString()
+                vipData?.android_template_id?.let { it1 -> getProduct(it1) }
+            } else {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
+                } else {
+                    toast(getString(R.string.shapeSelected))
+                }
+                hideLoading()
+            }
+        }
+        viewModel.googlePaidData.observe(this) {
+            if (it?.data != null) {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_success.toString())
+                } else {
+                    toast(getString(R.string.ve_google_pay_success))
+                }
+                viewModel.getUserInfo()
+                vipSplashDialog?.dismiss()
+            } else {
+                payBeanReq?.let { it1 -> RYAction.saveOrder(it1) }
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
+                } else {
+                    toast(getString(R.string.shapeSelected))
+                }
+                hideLoading()
+            }
+
+        }
         binding.tvUserAgreement.setOnClickListener {
             var fragmentsP: Long = 2747L
             if (fragmentsP == 197L) {
@@ -526,6 +609,16 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
             }
         }
         binding.tvStore.setOnClickListener {
+            singleOnClick {
+                startActivity(
+                    Intent(
+                        requireContext(),
+                        VeStoreActivity::class.java
+                    )
+                )
+            }
+        }
+        binding.clVip.setOnClickListener {
             singleOnClick {
                 var loggingY: MutableMap<String, String> = mutableMapOf<String, String>()
                 loggingY.put("trellis", "retried")
@@ -631,8 +724,10 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
 
     fun setLogoutDialog() {
         val dialog = LogoutDialog(requireContext()).apply {
-            setOnLogoutClickListener(object : LogoutDialog.LogoutOnClick{
+            setOnLogoutClickListener(object : LogoutDialog.LogoutOnClick {
                 override fun onLogoutAction() {
+                    EventBus.getDefault()
+                        .post(JActivityAdapter.HOME_LEAVE_APP)
                     viewModel.setLogout()
                 }
             })
@@ -735,9 +830,95 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
 
             showLoading()
             viewModel.getUserInfo()
+            setShowVipSlashDialog()
+
         }
     }
 
+    private var isVipSplash = false
+    fun setShowVipSlashDialog() {
+        // Fragment 可见
+        binding.root.postDelayed({
+//            if (!RYAction.isVipTo() && !isVipSplash) {
+            if (setShowVIPSlash() && !RYAction.isVipTo() && !isVipSplash) {
+                initPayData()
+                viewModel.getPaySettingsV3(0, 0)
+            }
+        }, 1000)
+    }
+
+    var vipSplashDialog: VipSplashDialog? = null
+
+    fun isFragmentVisible(): Boolean {
+        return isAdded &&
+                isResumed &&
+                !isHidden &&
+                view?.visibility == View.VISIBLE
+    }
+
+    private fun setVipSlashDialog(vipBeans: List<VePaySettingsBean.VipBean>) {
+        if (!isFragmentVisible()) {
+            return
+        }
+        vipSplashDialog = VipSplashDialog(requireContext(), vipBeans).apply {
+            setOnVipSplashOnClickListener(object :
+                VipSplashDialog.SetVipSplashOnClick {
+                override fun onVipSplash() {
+                    startActivity(
+                        Intent(
+                            requireContext(),
+                            VeStoreActivity::class.java
+                        )
+                    )
+                }
+
+                override fun onVipOnAdapterBuy(vipBean: VePaySettingsBean.VipBean) {
+                    if (!isConnect) {
+                        if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
+                        } else {
+                            toast(getString(R.string.ve_google_pay_error))
+                        }
+                        return
+                    }
+                    vipData = vipBean
+                    showLoading()
+                    viewModel.setCreatePayOrder(
+                        VeCreatePayOrderReqBean(
+                            vipData?.id.toString(),
+                            "google",
+                            0,
+                            0
+                        )
+                    )
+                }
+            })
+        }
+        vipSplashDialog?.setOnDismissListener {
+            RYAction.getMMKV().putLong(
+                JActivityAdapter.ACCOUNT_DIALOG_TIME_VIP_SPLASH,
+                System.currentTimeMillis()
+            )
+            isVipSplash = false
+            billingClientMe?.endConnection()
+            billingClientMe = null
+            System.gc()
+        }
+        vipSplashDialog?.show()
+        vipSplashDialog?.setVipSplashOnClick
+        isVipSplash = true
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        payBeanReq = null
+        if (billingClientMe != null) {
+            billingClientMe?.endConnection()
+            billingClientMe = null
+        }
+        System.gc()
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(event: String) {
         if (JActivityAdapter.HOME_USER_REFRESH == event || JActivityAdapter.HOME_REFRESH_ME == event) {
@@ -746,4 +927,240 @@ class UColorsAvatarFragment : JItemServiceFragment<EvBodyloadHomeBinding, OMNorm
         }
     }
 
+
+    private var billingClientMe: BillingClient? = null
+    private var connectNum = 0
+    private var isConnect = false
+    private var vipData: VePaySettingsBean.VipBean? = null
+    private var order_code = ""
+    private var payBeanReq: VePayBean? = null
+
+    private fun initPayData() {
+        val purchasesUpdatedMeListener =
+            PurchasesUpdatedListener { billingResult, purchases ->
+                when (billingResult.responseCode) {
+                    BillingClient.BillingResponseCode.OK -> {
+                        for (purchase in purchases!!) {
+                            if (purchase.purchaseState == Purchase.PurchaseState.PURCHASED) {
+                                consumePurchaseSubMe(purchase)
+                            }
+                        }
+                    }
+
+                    BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
+                        queryAndConsumePurchases()
+                        hideLoading()
+                    }
+
+                    BillingClient.BillingResponseCode.USER_CANCELED -> {
+                        if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_canceled.toString())
+                        } else {
+                            toast(getString(R.string.ve_google_pay_canceled))
+                        }
+                        hideLoading()
+                    }
+
+                    else -> {
+                        if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
+                        } else {
+                            toast(getString(R.string.ve_google_pay_error))
+                        }
+                        hideLoading()
+                    }
+                }
+            }
+
+
+        billingClientMe = BillingClient.newBuilder(requireContext())
+            .setListener(purchasesUpdatedMeListener)
+            .enablePendingPurchases()
+            .build()
+
+
+        val stateMeListener: BillingClientStateListener = object : BillingClientStateListener {
+            override fun onBillingSetupFinished(billingResult: BillingResult) {
+                if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                    isConnect = true
+                }
+            }
+
+            override fun onBillingServiceDisconnected() {
+                if (connectNum < 5) {
+                    connectNum++
+                    isConnect = false
+                    billingClientMe?.startConnection(this)
+                }
+            }
+        }
+        billingClientMe?.startConnection(stateMeListener)
+    }
+
+    private fun consumePurchaseSubMe(
+        purchase: Purchase
+    ) {
+        if (billingClientMe?.isReady == true) {
+            if (!purchase.isAcknowledged) {
+                val acknowledgePurchaseParams =
+                    AcknowledgePurchaseParams.newBuilder()
+                        .setPurchaseToken(purchase.purchaseToken)
+                        .build()
+                billingClientMe?.acknowledgePurchase(
+                    acknowledgePurchaseParams
+                ) {
+                    val vePayBean = VePayBean(
+                        order_code,
+                        vipData?.id.toString(),
+                        YFHome.getPackageName(),
+                        vipData?.android_template_id.toString(),
+                        purchase.purchaseToken,
+                        purchase.orderId.toString(),
+                        vipData?.price.toString()
+                    )
+                    payBeanReq = vePayBean
+                    if (it.responseCode == BillingClient.BillingResponseCode.OK) {
+                        lifecycleScope.launch {
+                            viewModel.setGooglePaid(vePayBean)
+                        }
+                    } else {
+                        RYAction.saveOrder(vePayBean)
+                        lifecycleScope.launch {
+                            toast(it.toString())
+                            hideLoading()
+                        }
+                    }
+                }
+            } else {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
+                } else {
+                    toast(getString(R.string.ve_google_pay_error))
+                }
+                hideLoading()
+            }
+        } else {
+            if (TranslationHelper.getTranslation() != null) {
+                toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
+            } else {
+                toast(getString(R.string.ve_google_pay_error))
+            }
+            hideLoading()
+        }
+    }
+
+    private fun querySubVipProductDetails(listSubVip: List<VePaySettingsBean.VipBean>) {
+        val productDetailsResponseListener =
+            ProductDetailsResponseListener { billingResult, productDetailsList ->
+                if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                    val priceInfo = productDetailsList.mapNotNull { productDetails ->
+                        productDetails.subscriptionOfferDetails?.get(0)?.pricingPhases?.pricingPhaseList?.get(
+                            0
+                        )?.let {
+                            productDetails.productId to (it.formattedPrice to it.priceCurrencyCode)
+                        }
+                    }.toMap()
+
+                    // 更新VIP列表的价格和货币代码
+                    val updatedVipList = listSubVip.map { vip ->
+                        priceInfo[vip.android_template_id]?.let { (price, currency) ->
+                            vip.copy(price_google = price, currency_goolge = currency)
+                        } ?: vip
+                    }
+
+                    binding.root.postDelayed({
+                        vipSplashDialog?.setAdapterSubmitList(updatedVipList)
+                        hideLoading()
+                    }, 500)
+                } else {
+                    hideLoading()
+                }
+            }
+
+        val productType: String = BillingClient.ProductType.SUBS
+
+        val inAppProductInfo = listSubVip.map {
+            QueryProductDetailsParams.Product.newBuilder()
+                .setProductId(it.android_template_id)
+                .setProductType(productType)
+                .build()
+        }
+        if (inAppProductInfo.isNotEmpty()) {
+            val productDetailsParams = QueryProductDetailsParams.newBuilder()
+                .setProductList(inAppProductInfo)
+                .build()
+            billingClientMe?.queryProductDetailsAsync(
+                productDetailsParams,
+                productDetailsResponseListener
+            )
+        } else {
+            hideLoading()
+        }
+    }
+
+    private fun getProduct(productId: String) {
+        val productDetailsResponseListener =
+            ProductDetailsResponseListener { billingResult, productDetailsList ->
+                if (productDetailsList.isNotEmpty()) {
+                    setPay(productDetailsList[0])
+                } else {
+                    lifecycleScope.launch {
+                        toast(billingResult.toString())
+                        hideLoading()
+                    }
+                }
+            }
+        val productType: String =
+            BillingClient.ProductType.SUBS
+
+        val inAppProductInfo = ArrayList<QueryProductDetailsParams.Product>()
+        inAppProductInfo.add(
+            QueryProductDetailsParams.Product.newBuilder()
+                .setProductId(productId)
+                .setProductType(productType)
+                .build()
+        )
+        val productDetailsParams = QueryProductDetailsParams.newBuilder()
+            .setProductList(inAppProductInfo)
+            .build()
+        billingClientMe?.queryProductDetailsAsync(
+            productDetailsParams,
+            productDetailsResponseListener
+        )
+    }
+
+    private fun setPay(productDetailInfo: ProductDetails) {
+        if (productDetailInfo.subscriptionOfferDetails?.isNotEmpty() == true) {
+            val params = ArrayList<BillingFlowParams.ProductDetailsParams>()
+            productDetailInfo.subscriptionOfferDetails?.get(0)?.offerToken?.let {
+                BillingFlowParams.ProductDetailsParams.newBuilder()
+                    .setProductDetails(productDetailInfo)
+                    .setOfferToken(it)
+                    .build()
+            }?.let {
+                params.add(
+                    it
+                )
+            }
+            val billingFlowParams = BillingFlowParams.newBuilder()
+                .setObfuscatedProfileId(order_code)
+                .setObfuscatedAccountId(RYAction.getCustomId())
+                .setProductDetailsParamsList(params)
+                .build()
+
+            billingClientMe?.launchBillingFlow(requireActivity(), billingFlowParams)
+        }
+    }
+
+    private fun queryAndConsumePurchases() {
+        // 查询所有未消费的购买记录
+        billingClientMe?.queryPurchasesAsync(BillingClient.ProductType.INAPP) { billingResult, purchaseList ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                for (purchase in purchaseList) {
+//                    consumePurchase(purchase)
+                }
+            }
+        }
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/ZEpisodeFragment.kt

@@ -398,6 +398,7 @@ class ZEpisodeFragment : JItemServiceFragment<QHeaderBinding, NNAndroid>(), NOFf
             })
             return
         }
+        showComplete()
         EventBus.getDefault().register(this)
         var s_heightN: String = "uplink"
 

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/adminSourceid/coordinate/OMNormalInstrumented.kt

@@ -6,6 +6,11 @@ import com.veloria.now.shortapp.newsletter.SStringsHelp
 import com.veloria.now.shortapp.newsletter.TStore
 import com.veloria.now.shortapp.texturedAsink.DoLoginBean
 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
 
 
 class OMNormalInstrumented : SStringsHelp() {
@@ -35,4 +40,29 @@ class OMNormalInstrumented : SStringsHelp() {
         repository.setLogout().observeForever { result ->
             _logoutLiveData.value = result.getOrNull()
         }
+
+    private val _paySettingsV3 = MutableLiveData<TStore<VePaySettingsBean>?>()
+    val PaySettingsV3: MutableLiveData<TStore<VePaySettingsBean>?> get() = _paySettingsV3
+    fun getPaySettingsV3(short_play_id: Int, short_play_video_id: Int) =
+        repository.getPaySettingsV3(short_play_id,short_play_video_id).observeForever { result ->
+            _paySettingsV3.value = result.getOrNull()
+        }
+
+
+    private val createPayOrderLiveData = MutableLiveData<TStore<VeCreatePayOrderBean>?>()
+    val createPayOrderData: MutableLiveData<TStore<VeCreatePayOrderBean>?> get() = createPayOrderLiveData
+    fun setCreatePayOrder(createOrderReq: VeCreatePayOrderReqBean) {
+        repository.setCreatePayOrder(createOrderReq).observeForever { result ->
+            createPayOrderLiveData.value = result.getOrNull()
+        }
+    }
+
+    private val googlePaidLiveData = MutableLiveData<TStore<VePayResBean>?>()
+    val googlePaidData: MutableLiveData<TStore<VePayResBean>?> get() = googlePaidLiveData
+    fun setGooglePaid(vePayBean: VePayBean?) {
+        repository.setGooglePaid(vePayBean).observeForever { result ->
+            googlePaidLiveData.value = result.getOrNull()
+        }
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/NotificationsDialog.kt

@@ -0,0 +1,65 @@
+package com.veloria.now.shortapp.subtractionCroll.avcintraRelock
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.TranslationHelper
+import org.greenrobot.eventbus.EventBus
+
+@SuppressLint("MissingInflatedId")
+class NotificationsDialog(context: Context) : Dialog(context) {
+
+    var setNotificationOnClick: SetNotificationOnClick? = null
+
+    interface SetNotificationOnClick {
+        fun notificationOnClick()
+    }
+
+    init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_notifications)
+
+        window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            setLayout(
+                (context.resources.displayMetrics.widthPixels * 0.8).toInt(),
+                WindowManager.LayoutParams.WRAP_CONTENT
+            )
+            setGravity(Gravity.CENTER)
+        }
+        setCancelable(true)
+
+        val ivClose = findViewById<AppCompatImageView>(R.id.iv_close)
+        val tvGo = findViewById<AppCompatTextView>(R.id.tv_go)
+        val tvContent = findViewById<AppCompatTextView>(R.id.tv_content)
+        val tvTitle = findViewById<AppCompatTextView>(R.id.tv_title)
+
+        if (TranslationHelper.getTranslation() != null) {
+            tvTitle.text = TranslationHelper.getTranslation()?.veloria_open_notice_at_watch_video
+            tvContent.text = TranslationHelper.getTranslation()?.veloria_open_notice_alert_text
+            tvGo.text = TranslationHelper.getTranslation()?.veloria_allow
+        }
+
+        ivClose.setOnClickListener {
+            dismiss()
+        }
+
+        tvGo.setOnClickListener {
+            setNotificationOnClick?.notificationOnClick()
+            dismiss()
+        }
+    }
+
+    fun setOnNotificationClickListener(listener: SetNotificationOnClick) {
+        this.setNotificationOnClick = listener
+    }
+}

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/PlayerBuyDialogFragment.kt

@@ -94,6 +94,8 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
 
         if (TranslationHelper.getTranslation() != null) {
             binding?.tvCoinsText?.text = TranslationHelper.getTranslation()?.veloria_your_coins
+            binding?.tvCoinTitle?.text = TranslationHelper.getTranslation()?.veloria_coin_buy_title
+            binding?.tvUnlockText?.text = TranslationHelper.getTranslation()?.veloria_unlock
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 binding?.tvTips?.text = Html.fromHtml(
                     TranslationHelper.getTranslation()?.veloria_store_tips
@@ -111,6 +113,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
 
         initLoading()
         binding?.tvCoins?.text = RYAction.getAllCoinTotal().toString()
+        binding?.tvUnlock?.text = parcelable?.coins?.toString()
 
         binding?.ivCloseDialog?.setOnClickListener {
             dismiss()
@@ -218,6 +221,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
         singleOnClick {
             if (!isConnect) {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
                 } else {
                     toast(getString(R.string.ve_google_pay_error))
                 }
@@ -317,6 +321,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
                 }
             } else {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 } else {
                     toast(getString(R.string.shapeSelected))
                 }
@@ -326,12 +331,10 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
         viewModel.googlePaidData.observe(this) {
             if (it?.data != null) {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_success.toString())
                 } else {
                     toast(getString(R.string.ve_google_pay_success))
                 }
-                if (null != payBeanReq) {
-                    RYAction.removeOrder(payBeanReq)
-                }
                 EventBus.getDefault()
                     .post(JActivityAdapter.VIDEO_PAY_REFRESH)
                 dismiss()
@@ -339,6 +342,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
             } else {
                 payBeanReq?.let { it1 -> RYAction.saveOrder(it1) }
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 } else {
                     toast(getString(R.string.shapeSelected))
                 }
@@ -364,8 +368,14 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
                         }
                     }
 
+                    BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
+                        queryAndConsumePurchases()
+                        hideLoading()
+                    }
+
                     BillingClient.BillingResponseCode.USER_CANCELED -> {
                         if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_canceled.toString())
                         } else {
                             toast(getString(R.string.ve_google_pay_canceled))
                         }
@@ -374,6 +384,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
 
                     else -> {
                         if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
                         } else {
                             toast(getString(R.string.ve_google_pay_error))
                         }
@@ -655,7 +666,7 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
             billingClientData?.consumeAsync(consumeParams, responseListener)
         } else {
             if (TranslationHelper.getTranslation() != null) {
-//                toast(TranslationHelper.getTranslation()?.mireo_g_pay_error.toString())
+                toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
             } else {
                 toast(getString(R.string.ve_google_pay_error))
             }
@@ -663,6 +674,16 @@ class PlayerBuyDialogFragment : BottomSheetDialogFragment() {
         }
     }
 
+    private fun queryAndConsumePurchases() {
+        // 查询所有未消费的购买记录
+        billingClientData?.queryPurchasesAsync(BillingClient.ProductType.INAPP) { billingResult, purchaseList ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                for (purchase in purchaseList) {
+                    consumePurchase(purchase)
+                }
+            }
+        }
+    }
 
     override fun onDismiss(dialog: DialogInterface) {
         payBeanReq = null

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VersionControlDialog.kt

@@ -0,0 +1,95 @@
+package com.veloria.now.shortapp.subtractionCroll.avcintraRelock
+
+import android.app.Dialog
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.net.Uri
+import android.os.Build
+import android.text.Html
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.RYAction
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.YFHome
+import com.veloria.now.shortapp.texturedAsink.VersionControlBean
+
+class VersionControlDialog(context: Context, versionControlBean: VersionControlBean) :
+    Dialog(context) {
+
+    init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_version_control)
+
+        window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            setLayout(
+                (context.resources.displayMetrics.widthPixels * 0.8).toInt(),
+                WindowManager.LayoutParams.WRAP_CONTENT
+            )
+            setGravity(Gravity.CENTER)
+        }
+        setCancelable(false)
+
+        val ivClose = findViewById<AppCompatImageView>(R.id.iv_close)
+        val tvVersion = findViewById<AppCompatTextView>(R.id.tv_version)
+        val tvNow = findViewById<AppCompatTextView>(R.id.tv_now)
+        val tvContent = findViewById<AppCompatTextView>(R.id.tv_content)
+        val tvTitle = findViewById<AppCompatTextView>(R.id.tv_title)
+
+        tvVersion.text = "v".plus(versionControlBean.version_name)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            tvContent?.text = Html.fromHtml(
+                versionControlBean.description, Html.FROM_HTML_MODE_COMPACT
+            )
+        } else {
+            tvContent?.text = Html.fromHtml(
+                versionControlBean.description
+            )
+        }
+
+        if (TranslationHelper.getTranslation() != null) {
+            tvTitle.text = TranslationHelper.getTranslation()?.veloria_update_title
+            tvNow.text = TranslationHelper.getTranslation()?.veloria_update_now
+        }
+
+        ivClose.setOnClickListener {
+            dismiss()
+        }
+
+        tvNow.setOnClickListener {
+            setOpenGooglePlayStore(YFHome.getPackageName())
+            dismiss()
+        }
+
+        this.setOnDismissListener {
+            RYAction.getMMKV().putLong(
+                JActivityAdapter.ACCOUNT_VERSION_CONTROL_TIME,
+                System.currentTimeMillis()
+            )
+        }
+    }
+
+    private fun setOpenGooglePlayStore(packageName: String) {
+        try {
+            val intent = Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=$packageName"))
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            val intent = Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse("https://play.google.com/store/apps/details?id=$packageName")
+            )
+            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            context.startActivity(intent)
+        }
+    }
+
+
+}

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipActivateDialog.kt

@@ -0,0 +1,64 @@
+package com.veloria.now.shortapp.subtractionCroll.avcintraRelock
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.TranslationHelper
+import org.greenrobot.eventbus.EventBus
+
+@SuppressLint("MissingInflatedId")
+class VipActivateDialog(context: Context) : Dialog(context) {
+
+    init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_vip_activate)
+
+        window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            setLayout(
+                (context.resources.displayMetrics.widthPixels * 0.8).toInt(),
+                WindowManager.LayoutParams.WRAP_CONTENT
+            )
+            setGravity(Gravity.CENTER)
+        }
+        setCancelable(true)
+
+        val ivClose = findViewById<AppCompatImageView>(R.id.iv_close)
+        val tvCancel = findViewById<AppCompatTextView>(R.id.tv_cancel)
+        val tvGo = findViewById<AppCompatTextView>(R.id.tv_go)
+        val tvContent = findViewById<AppCompatTextView>(R.id.tv_content)
+        val tvTitle = findViewById<AppCompatTextView>(R.id.tv_title)
+
+        if (TranslationHelper.getTranslation() != null) {
+            tvTitle.text = TranslationHelper.getTranslation()?.veloria_vip_activate_title
+            tvContent.text = TranslationHelper.getTranslation()?.veloria_vip_activate_content
+            tvCancel.text = TranslationHelper.getTranslation()?.veloria_later
+            tvGo.text = TranslationHelper.getTranslation()?.veloria_go
+        }
+
+        ivClose.setOnClickListener {
+            dismiss()
+        }
+        tvCancel.setOnClickListener {
+            EventBus.getDefault()
+                .post(JActivityAdapter.VIDEO_START_PLAY)
+            dismiss()
+        }
+
+        tvGo.setOnClickListener {
+            EventBus.getDefault()
+                .post(JActivityAdapter.VIDEO_STOP_PLAY)
+            dismiss()
+        }
+    }
+
+}

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipQualityDialog.kt

@@ -0,0 +1,141 @@
+package com.veloria.now.shortapp.subtractionCroll.avcintraRelock
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.RYAction
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.subtractionCroll.bidirectional.PSVHomeSearchActivity
+import com.veloria.now.shortapp.texturedAsink.VeRevolutionsBean
+import org.greenrobot.eventbus.EventBus
+
+@SuppressLint("MissingInflatedId")
+class VipQualityDialog(context: Context, revolutionsBean: VeRevolutionsBean) : Dialog(context) {
+    var setQualityBackOnClick: SetQualityBackOnClick? = null
+
+    interface SetQualityBackOnClick {
+        fun qualityBackOnClick(quality: Int)
+        fun loginOnClick()
+        fun showActivateOnClick()
+    }
+
+    init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_ve_quality)
+
+        window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            setLayout(
+                (context.resources.displayMetrics.widthPixels * 0.95).toInt(),
+                WindowManager.LayoutParams.WRAP_CONTENT
+            )
+            setGravity(Gravity.BOTTOM)
+        }
+        setCancelable(true)
+
+        val tvQuality480 = findViewById<AppCompatTextView>(R.id.tv_quality_480)
+        val tvQuality720 = findViewById<AppCompatTextView>(R.id.tv_quality_720)
+        val tvQuality1080 = findViewById<AppCompatTextView>(R.id.tv_quality_1080)
+        val tvLoginTag = findViewById<AppCompatTextView>(R.id.tv_login_tag)
+        val tvVipTag = findViewById<AppCompatTextView>(R.id.tv_vip_tag)
+
+        if (TranslationHelper.getTranslation() != null) {
+            tvLoginTag.text = TranslationHelper.getTranslation()?.veloria_login
+
+        } else {
+            tvLoginTag.text = "Login"
+        }
+
+        val size = revolutionsBean.list?.size ?: 0
+        val int = RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 0)
+        if (size > 0 && null != revolutionsBean?.list?.get(0)) {
+            val revolutionData = revolutionsBean.list[0]
+            tvQuality480.text = revolutionData.value.toString().plus("p")
+            if (revolutionData.can_check) {
+                if (int == revolutionData.value) {
+                    tvQuality480.setBackgroundResource(R.mipmap.iv_quality_bg_on)
+                } else {
+                    tvQuality480.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+                }
+                tvQuality480.setTextColor(Color.parseColor("#FFFFFF"))
+                tvQuality480.setOnClickListener {
+                    if (int != revolutionData.value) {
+                        setQualityBackOnClick?.qualityBackOnClick(revolutionData.value)
+                        dismiss()
+                    }
+                }
+            } else {
+                tvQuality480.setTextColor(Color.parseColor("#8B8B8B"))
+                tvQuality480.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+            }
+        }
+        if (size > 1 && null != revolutionsBean?.list?.get(1)) {
+            val revolutionData = revolutionsBean.list[1]
+            tvQuality720.text = revolutionData.value.toString().plus("p")
+            if (revolutionData.can_check) {
+                if (int == revolutionData.value) {
+                    tvQuality720.setBackgroundResource(R.mipmap.iv_quality_bg_on)
+                } else {
+                    tvQuality720.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+                }
+                tvQuality720.setTextColor(Color.parseColor("#FFFFFF"))
+                tvQuality720.setOnClickListener {
+                    if (int != revolutionData.value) {
+                        setQualityBackOnClick?.qualityBackOnClick(revolutionData.value)
+                        dismiss()
+                    }
+                }
+            } else {
+                tvQuality720.setTextColor(Color.parseColor("#8B8B8B"))
+                tvQuality720.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+                tvQuality720.setOnClickListener {
+//                    EventBus.getDefault().post(JActivityAdapter.VIDEO_PAUSE_PLAY)
+                    setQualityBackOnClick?.loginOnClick()
+                    dismiss()
+                }
+            }
+        }
+
+        if (size > 2 && null != revolutionsBean?.list?.get(2)) {
+            val revolutionData = revolutionsBean.list[2]
+            tvQuality1080.text = revolutionData.value.toString().plus("p")
+            if (revolutionData.can_check) {
+                if (int == revolutionData.value) {
+                    tvQuality1080.setBackgroundResource(R.mipmap.iv_quality_bg_on)
+                } else {
+                    tvQuality1080.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+                }
+                tvQuality1080.setTextColor(Color.parseColor("#FFFFFF"))
+                tvQuality1080.setOnClickListener {
+                    if (int != revolutionData.value) {
+                        setQualityBackOnClick?.qualityBackOnClick(revolutionData.value)
+                        dismiss()
+                    }
+                }
+            } else {
+                tvQuality1080.setTextColor(Color.parseColor("#8B8B8B"))
+                tvQuality1080.setBackgroundResource(R.mipmap.iv_quality_bg_off)
+                tvQuality1080.setOnClickListener {
+                    EventBus.getDefault().post(JActivityAdapter.VIDEO_PAUSE_PLAY)
+                    setQualityBackOnClick?.showActivateOnClick()
+                    dismiss()
+                }
+            }
+        }
+    }
+
+    fun setOnQualityBackOnClickListener(listener: SetQualityBackOnClick) {
+        this.setQualityBackOnClick = listener
+    }
+
+}

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/avcintraRelock/VipSplashDialog.kt

@@ -0,0 +1,99 @@
+package com.veloria.now.shortapp.subtractionCroll.avcintraRelock
+
+import android.annotation.SuppressLint
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.View
+import android.view.Window
+import android.view.WindowManager
+import android.widget.TextView
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.appcompat.widget.AppCompatTextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.singleOnClick
+import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeStoreCoinAdapter
+import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeVipSplashAdapter
+import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
+
+@SuppressLint("MissingInflatedId")
+class VipSplashDialog(context: Context,vipBeans: List<VePaySettingsBean.VipBean>) : Dialog(context) {
+    var setVipSplashOnClick: SetVipSplashOnClick? = null
+    private var vipAdapter: VeVipSplashAdapter? = null
+
+    interface SetVipSplashOnClick {
+        fun onVipSplash()
+        fun onVipOnAdapterBuy(vipBean: VePaySettingsBean.VipBean)
+    }
+
+    init {
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        setContentView(R.layout.dialog_vip_splash)
+
+        window?.apply {
+            setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            setLayout(
+                (context.resources.displayMetrics.widthPixels * 0.8).toInt(),
+                WindowManager.LayoutParams.WRAP_CONTENT
+            )
+            setGravity(Gravity.TOP or Gravity.CENTER_HORIZONTAL)
+        }
+        setCancelable(true)
+
+        val ivClose = findViewById<AppCompatImageView>(R.id.iv_close)
+        val tvContent = findViewById<AppCompatTextView>(R.id.tv_content)
+        val tvTitle = findViewById<AppCompatTextView>(R.id.tv_title)
+        val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+
+        if (TranslationHelper.getTranslation() != null) {
+            tvTitle.text = TranslationHelper.getTranslation()?.veloria_vip_splash_title
+            tvContent.text = TranslationHelper.getTranslation()?.veloria_vip_splash_content
+
+        } else {
+            tvTitle.text = "Unlock VIP Privileges!"
+            tvContent.text = "Enjoy ad-free streaming, early access, and exclusive content!"
+        }
+
+        recyclerView.layoutManager = LinearLayoutManager(context)
+        vipAdapter = VeVipSplashAdapter()
+        recyclerView.adapter = vipAdapter
+        vipAdapter?.submitList(vipBeans)
+
+
+        ivClose.setOnClickListener {
+            singleOnClick {
+                dismiss()
+            }
+        }
+
+
+        vipAdapter?.setOnItemClickListener { adapter, view, position ->
+            singleOnClick {
+
+                val data = adapter.getItem(position)
+
+                vipAdapter?.currentPosition = position
+                vipAdapter?.notifyDataSetChanged()
+
+                if (data != null) {
+                    setVipSplashOnClick?.onVipOnAdapterBuy(data)
+                }
+            }
+        }
+
+    }
+
+    fun setOnVipSplashOnClickListener(listener: SetVipSplashOnClick) {
+        this.setVipSplashOnClick = listener
+    }
+
+    fun setAdapterSubmitList(data: List<VePaySettingsBean.VipBean>){
+        vipAdapter?.submitList(data)
+    }
+
+}

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/HLanguageActivity.kt

@@ -151,6 +151,26 @@ class HLanguageActivity : AIXTextActivity<MqInstrumentedBinding, YCFddebcdbeeffc
 
         this.testDetails_list = mutableListOf<Float>()
 
+        binding.ivBack.setOnClickListener {
+            var complete9: Long = 6360L
+            if (complete9 == 49L) {
+            }
+
+
+            var system2: Float = 1503.0f
+
+
+            finish()
+        }
+        if (TranslationHelper.getTranslation() != null){
+            binding.etSearch.hint = TranslationHelper.getTranslation()?.veloria_recersal_of_fate
+            binding.tvTitleRecent.text = TranslationHelper.getTranslation()?.veloria_recent_searches
+            binding.tvTitleRecommended.text = TranslationHelper.getTranslation()?.veloria_recommended
+            binding.tvTrendingTop.text = TranslationHelper.getTranslation()?.veloria_trending_top
+            binding.tvLatestTrends.text = TranslationHelper.getTranslation()?.veloria_latest_trends
+            binding.tvResultTitle.text = TranslationHelper.getTranslation()?.veloria_search_results
+        }
+
 
         if (!NetworkUtils.isConnected()) {
             var langR: Float = 4492.0f
@@ -213,7 +233,7 @@ class HLanguageActivity : AIXTextActivity<MqInstrumentedBinding, YCFddebcdbeeffc
                 break
             }
 
-
+            showComplete()
             binding.clOne.visibility = View.VISIBLE
             var displaye: Double = 49.0
             if (displaye > 179.0) {
@@ -223,15 +243,6 @@ class HLanguageActivity : AIXTextActivity<MqInstrumentedBinding, YCFddebcdbeeffc
             binding.stateLayout.visibility = View.GONE
         }
 
-        if (TranslationHelper.getTranslation() != null){
-            binding.etSearch.hint = TranslationHelper.getTranslation()?.veloria_recersal_of_fate
-            binding.tvTitleRecent.text = TranslationHelper.getTranslation()?.veloria_recent_searches
-            binding.tvTitleRecommended.text = TranslationHelper.getTranslation()?.veloria_recommended
-            binding.tvTrendingTop.text = TranslationHelper.getTranslation()?.veloria_trending_top
-            binding.tvLatestTrends.text = TranslationHelper.getTranslation()?.veloria_latest_trends
-        }
-
-
         searchTrendAdapter = VXAgreement()
         var buttonu: Int = 3389
         if (buttonu < 189) {
@@ -419,17 +430,6 @@ class HLanguageActivity : AIXTextActivity<MqInstrumentedBinding, YCFddebcdbeeffc
 
 
 
-        binding.ivBack.setOnClickListener {
-            var complete9: Long = 6360L
-            if (complete9 == 49L) {
-            }
-
-
-            var system2: Float = 1503.0f
-
-
-            finish()
-        }
         binding.ivDelete.setOnClickListener {
             var selectZ: Float = 4767.0f
             while (selectZ < 108.0f) {

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/MQVAutoWidthActivity.kt

@@ -1,6 +1,7 @@
 package com.veloria.now.shortapp.subtractionCroll.bidirectional
 
 import android.annotation.SuppressLint
+import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
@@ -10,14 +11,9 @@ import androidx.activity.viewModels
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.fragment.app.DialogFragment.STYLE_NO_FRAME
-import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.MediaItem
-import androidx.media3.common.PlaybackException
-import androidx.media3.common.Player
 import androidx.media3.datasource.DataSource
 import androidx.media3.datasource.DefaultDataSourceFactory
-import androidx.media3.exoplayer.DefaultRenderersFactory
-import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.exoplayer.hls.HlsMediaSource
 import androidx.media3.exoplayer.source.MediaSource
 import androidx.media3.exoplayer.source.ProgressiveMediaSource
@@ -25,10 +21,18 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.blankj.utilcode.util.NetworkUtils
 import com.bumptech.glide.Glide
+import com.facebook.AccessToken
+import com.facebook.CallbackManager
+import com.facebook.CallbackManager.Factory.create
+import com.facebook.FacebookCallback
+import com.facebook.FacebookException
+import com.facebook.GraphRequest
+import com.facebook.login.LoginManager
+import com.facebook.login.LoginResult
 import com.google.gson.Gson
 import com.veloria.now.shortapp.R
-import com.veloria.now.shortapp.civil.BImage
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.JActivityAdapter.CONSTANTS_QUALITY_REFRESH
 import com.veloria.now.shortapp.civil.JActivityAdapter.PLAYER_DETAILS_CAN_PLAY
 import com.veloria.now.shortapp.civil.JActivityAdapter.VIDEO_ACTIVITY_ID
 import com.veloria.now.shortapp.civil.JActivityAdapter.VIDEO_SHORT_PLAY_ID
@@ -40,25 +44,31 @@ import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.JDetailsLayoutBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
+import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.rewards.TOYPlayfairAutoView
 import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.DSPUnitVideoFragment
 import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.FYStatusAppveloria
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.LoginDialog
 import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.PlayerBuyDialogFragment
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.VipActivateDialog
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.VipQualityDialog
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.UKBottomCollection
 import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.SUJustSmart
 import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeBannerRecommendAdapter
 import com.veloria.now.shortapp.texturedAsink.LServiceBean
+import com.veloria.now.shortapp.texturedAsink.LoginDataBean
 import com.veloria.now.shortapp.texturedAsink.NBECenterBean
 import com.veloria.now.shortapp.texturedAsink.PURLockBean
 import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean
 import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
+import com.veloria.now.shortapp.texturedAsink.VeRevolutionsBean
 import com.veloria.now.shortapp.texturedAsink.XAboutBean
-import com.youth.banner.listener.OnPageChangeListener
-import kotlinx.coroutines.launch
+import com.zhpan.bannerview.constants.PageStyle.MULTI_PAGE_OVERLAP
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.json.JSONObject
 import kotlin.math.max
 import kotlin.math.min
 
@@ -174,11 +184,6 @@ class MQVAutoWidthActivity :
     private var revolution =
         RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 540).toString()
 
-
-    @SuppressLint("UnsafeOptInUsageError")
-    private var builder: ExoPlayer.Builder? = null
-    private var player: ExoPlayer? = null
-
     public fun illegalPositiveFinishAreaWorkAny(): Float {
         var menuRecommends: String = "strideable"
         var againText: Double = 4231.0
@@ -243,6 +248,9 @@ class MQVAutoWidthActivity :
             }
 
             manifestAnyBuildGravityView()?.pause()
+            if (binding.layoutRecommend.root.visibility == View.VISIBLE) {
+                bannerAdapter?.getCurrentPlayerView()?.pause()
+            }
         }, 300)
     }
 
@@ -453,6 +461,42 @@ class MQVAutoWidthActivity :
         if (JActivityAdapter.VIDEO_PAY_REFRESH_DISMISS == event) {
             isBuyShowDialog = false
         }
+        if (JActivityAdapter.VIDEO_PAUSE_PLAY == event) {
+            binding.root.postDelayed({
+                manifestAnyBuildGravityView()?.pause()
+            }, 500)
+        }
+        if (JActivityAdapter.VIDEO_START_PLAY == event) {
+            binding.root.postDelayed({
+                manifestAnyBuildGravityView()?.play()
+            }, 500)
+        }
+        if (JActivityAdapter.VIDEO_STOP_PLAY == event) {
+            recommendAdapter?.items?.get(currentPosition)?.let {
+                setPlayerBuyDialog(it)
+            }
+            binding.root.postDelayed({
+                manifestAnyBuildGravityView()?.stop()
+            }, 500)
+        }
+        if (JActivityAdapter.CONSTANTS_QUALITY == event) {
+            if (episode?.is_lock == false) {
+                viewModel.getQualityData()
+            }
+        }
+        if (JActivityAdapter.HOME_USER_REFRESH == event) {
+            revolution = "720"
+            RYAction.getMMKV()
+                .putInt(JActivityAdapter.CONSTANTS_QUALITY, 720)
+            detailRefresh()
+            EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH)
+        }
+        if (JActivityAdapter.CONSTANTS_QUALITY_REFRESH == event) {
+            revolution =
+                RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+                    .toString()
+            isQualityRefresh = true
+        }
 
     }
 
@@ -488,8 +532,6 @@ class MQVAutoWidthActivity :
         if (h_viewf < 96) {
         }
 
-
-        EventBus.getDefault().register(this)
         var watchingB: Float = 8505.0f
         if (watchingB > 46.0f) {
         }
@@ -519,12 +561,12 @@ class MQVAutoWidthActivity :
             break
         }
 
-
+        binding.ivBack.setOnClickListener { finish() }
 
         if (!NetworkUtils.isConnected()) {
             var lightf: Long = 4156L
 
-
+            binding.ivBack.visibility = View.VISIBLE
             showErrorData(object : VSNotificationsDefault.OnRetryListener {
 
                 public fun spanLoveWhatBinge(): Boolean {
@@ -556,6 +598,7 @@ class MQVAutoWidthActivity :
                     initView()
                 }
             })
+
             return
         } else {
             var playh: MutableList<Double> = mutableListOf<Double>()
@@ -564,17 +607,29 @@ class MQVAutoWidthActivity :
             playh.add(941.0)
             if (playh.size > 20) {
             }
-
+            binding.ivBack.visibility = View.GONE
 
             showComplete()
             var marqueeo: Float = 1740.0f
             if (marqueeo < 162.0f) {
             }
 
-            showLoading()
+//            if (revolution == "1080" && !RYAction.isVipTo()) {
+//                if (RYAction.isTouristTo()) {
+//                    RYAction.getMMKV()
+//                        .putInt(JActivityAdapter.CONSTANTS_QUALITY, 540)
+//                } else {
+//                    RYAction.getMMKV()
+//                        .putInt(JActivityAdapter.CONSTANTS_QUALITY, 720)
+//                }
+//                EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH)
+//                revolution =
+//                    RYAction.getMMKV().getInt(JActivityAdapter.CONSTANTS_QUALITY, 540).toString()
+//            }
+
             viewModel.getVideoPlayDetails(shortPlayId, 0, activityId, revolution)
         }
-
+        EventBus.getDefault().register(this)
 
         onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
@@ -583,47 +638,12 @@ class MQVAutoWidthActivity :
                 }
             }
         })
-        builder = ExoPlayer.Builder(this, BImage(this))
-            .setRenderersFactory(DefaultRenderersFactory(this).setEnableDecoderFallback(true))
-        player = builder?.build()
-        binding.layoutRecommend.recommendPlayerView.player = player
-        ivCoverRecommendDetail =
-            binding.layoutRecommend.recommendPlayerView.findViewById(R.id.iv_cover_recommend_detail)
-        player?.addListener(object : Player.Listener {
-            override fun onPlaybackStateChanged(playbackState: Int) {
-                super.onPlaybackStateChanged(playbackState)
-                when (playbackState) {
-                    Player.STATE_BUFFERING -> {
-
-                    }
-
-                    Player.STATE_READY -> {
-                        player?.play()
-                        ivCoverRecommendDetail?.visibility = View.INVISIBLE
-                    }
-
-                    Player.STATE_ENDED -> {
-                        ivCoverRecommendDetail?.visibility = View.VISIBLE
-                    }
-
-                    Player.STATE_IDLE -> {
-                    }
-                }
-            }
-
-            override fun onPlayerError(error: PlaybackException) {
-                super.onPlayerError(error)
-                ivCoverRecommendDetail?.visibility = View.VISIBLE
-            }
-
-        })
 
         binding.layoutRecommend.ivCloseDialog.setOnClickListener {
             finish()
         }
 
-
-
+        showLoading()
         var appendK: MutableMap<String, Float> = mutableMapOf<String, Float>()
         appendK.put("decklink", 519.0f)
         appendK.put("flattened", 285.0f)
@@ -932,6 +952,10 @@ class MQVAutoWidthActivity :
 
 
             manifestAnyBuildGravityView()?.play()
+
+            if (binding.layoutRecommend.root.visibility == View.VISIBLE) {
+                bannerAdapter?.getCurrentPlayerView()?.play()
+            }
         } else {
             var listso: String = "agate"
 
@@ -1363,10 +1387,6 @@ class MQVAutoWidthActivity :
             while (cagetoryb >= 19.0) {
                 break
             }
-            player?.stop()
-            player?.release()
-            player = null
-
             manifestAnyBuildGravityView()?.stop()
             var circleA: Int = 8245
             while (circleA >= 16) {
@@ -1375,6 +1395,11 @@ class MQVAutoWidthActivity :
 
 
             manifestAnyBuildGravityView()?.release()
+            if (::bannerAdapter.isInitialized) {
+                bannerAdapter?.getCurrentPlayerView()?.stop()
+                bannerAdapter?.getCurrentPlayerView()?.release()
+            }
+
         }
         recommendAdapter?.shortVideo = null
         var mmkvi: Double = 540.0
@@ -1618,7 +1643,7 @@ class MQVAutoWidthActivity :
                 }
                 println(startA)
 
-
+                binding.ivBack.visibility = View.GONE
                 showComplete()
                 var rights: Long = 9660L
                 if (rights > 16L) {
@@ -1670,7 +1695,7 @@ class MQVAutoWidthActivity :
                         break
                     }
 
-
+                    binding.ivBack.visibility = View.VISIBLE
                     showEmptyData()
                 }
             }
@@ -1903,26 +1928,33 @@ class MQVAutoWidthActivity :
         }
 
         viewModel.detailsRecommendLiveData.observe(this) {
-            hideLoading()
             it?.data?.let {
                 setDetailsRecommendation(it)
             } ?: finish()
-
+            hideLoading()
         }
 
         viewModel.userInfo.observe(this) {
             it?.data?.let {
                 RYAction.saveUserInfoBean(it)
                 if (needRestart) {
-                    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)
+                    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")
                     }
+
                     detailRefresh()
                 }
             }
@@ -1967,6 +1999,102 @@ class MQVAutoWidthActivity :
                 }
             }
         }
+
+        viewModel.qualityData.observe(this) {
+            it?.data?.let {
+                setQualityDialog(it)
+            } ?: run {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
+                } else {
+                    toast(getString(R.string.shapeSelected))
+                }
+            }
+        }
+
+        callbackManager = create()
+        LoginManager.getInstance().registerCallback(callbackManager,
+            object : FacebookCallback<LoginResult> {
+                override fun onSuccess(loginResult: LoginResult) {
+                    val enableButtons = AccessToken.getCurrentAccessToken() != null
+                    if (enableButtons) {
+                        val mGraphRequest = GraphRequest.newMeRequest(
+                            loginResult.accessToken
+                        ) { jsonObject, response ->
+                            if (response!!.error != null) {
+                                if (TranslationHelper.getTranslation() != null) {
+                                    toast(
+                                        "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
+                                            .plus(".${response.error?.exception.toString()}")
+                                    )
+                                } else {
+                                    toast("Facebook Error")
+                                }
+                            } else {
+                                val id = jsonObject?.optString("id")
+                                val name = jsonObject?.optString("name")
+                                val object_pic: JSONObject? = jsonObject!!.optJSONObject("picture")
+                                val object_data = object_pic?.optJSONObject("data")
+                                val photo = object_data?.optString("url")
+                                viewModel.setLeaveApp()
+                                viewModel.setDoLogin(
+                                    LoginDataBean(
+                                        photo.toString(),
+                                        "",
+                                        name.toString(),
+                                        "",
+                                        "facebook",
+                                        id.toString()
+                                    )
+                                )
+                            }
+                        }
+                        val parameters = Bundle()
+                        parameters.putString("fields", "id,name,email,picture")
+                        mGraphRequest.parameters = parameters
+                        mGraphRequest.executeAsync()
+                    }
+                }
+
+                override fun onCancel() {
+                    if (TranslationHelper.getTranslation() != null) {
+                        toast("Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_cancel))
+                    } else {
+                        toast("Facebook Cancel")
+                    }
+                }
+
+                override fun onError(exception: FacebookException) {
+                    if (TranslationHelper.getTranslation() != null) {
+                        toast(
+                            "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
+                                .plus("n.$exception")
+                        )
+                    } else {
+                        toast("Facebook Error")
+                    }
+                }
+            })
+
+
+
+        viewModel.loginLiveData.observe(this) {
+            if (it?.data != null) {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_succeed.toString())
+                }
+                RYAction.getMMKV()
+                    .putString(JActivityAdapter.ACCOUNT_TOKEN, it.data.token)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_ENTER_THE_APP)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_ON_LINE)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_USER_REFRESH)
+
+            }
+        }
+
     }
 
 
@@ -1996,6 +2124,14 @@ class MQVAutoWidthActivity :
     }
 
     private fun showGoldShortageDialog(episode1: XAboutBean.Episode) {
+        if (!NetworkUtils.isConnected()) {
+            if (TranslationHelper.getTranslation() != null) {
+                toast(TranslationHelper.getTranslation()?.veloria_network.toString())
+            } else {
+                toast(XNBackground.instance.getString(R.string.shapeSelected))
+            }
+            return
+        }
         val allCoin = RYAction.getAllCoinTotal()
         if (allCoin >= episode1.coins) {
             if (currentPosition > 0) {
@@ -2073,21 +2209,34 @@ class MQVAutoWidthActivity :
         return false
     }
 
+    private lateinit var bannerAdapter: VeBannerRecommendAdapter
 
     @SuppressLint("UnsafeOptInUsageError")
     private fun setDetailsRecommendation(data: VeDetailsRecommendBean) {
         if (data.list.isNotEmpty()) {
+            if (TranslationHelper.getTranslation() != null) {
+                binding.layoutRecommend.tvTitle.text =
+                    TranslationHelper.getTranslation()?.veloria_detail_recommand_title
+                binding.layoutRecommend.tvWatchNow.text =
+                    TranslationHelper.getTranslation()?.veloria_watch_now
+            }
+
             PLAYER_DETAILS_CAN_PLAY = false
             binding.layoutRecommend.root.visibility = View.VISIBLE
-            val bannerAdapter =
-                VeBannerRecommendAdapter(data.list)
-            binding.layoutRecommend.bannerRecommend.setBannerGalleryMZ(
-                resources.getDimension(R.dimen.dp_20).toInt()
+            bannerAdapter =
+                VeBannerRecommendAdapter()
+            binding.layoutRecommend.bannerRecommend.setAdapter(
+                bannerAdapter
             )
+            binding.layoutRecommend.bannerRecommend.apply {
+                setLifecycleRegistry(lifecycle)
+                setRevealWidth(resources.getDimension(R.dimen.dp_50).toInt())
+                setPageStyle(MULTI_PAGE_OVERLAP)
+            }.create(data.list)
 
-            binding.layoutRecommend.bannerRecommend.addOnPageChangeListener(
+            binding.layoutRecommend.bannerRecommend.registerOnPageChangeCallback(
                 object :
-                    OnPageChangeListener {
+                    ViewPager2.OnPageChangeCallback() {
                     override fun onPageScrolled(
                         position: Int,
                         positionOffset: Float,
@@ -2100,56 +2249,34 @@ class MQVAutoWidthActivity :
                         bannerPosition = position
                         bannerAdapter.currentPlayingPosition = position
                         bannerAdapter.notifyDataSetChanged()
-                        val data = bannerAdapter.getData(position)
-                        ivCoverRecommendDetail?.let { it1 ->
-                            Glide.with(this@MQVAutoWidthActivity)
-                                .load(data?.image_url)
-                                .into(it1)
-                        }
-                        binding.layoutRecommend.cardView.visibility = View.VISIBLE
-                        ivCoverRecommendDetail?.visibility = View.VISIBLE
-                        player?.stop()
-                        player?.setMediaSource(buildMediaSource(data?.video_url.toString()))
-                        player?.prepare()
                     }
 
                     override fun onPageScrollStateChanged(state: Int) {
-                        if (1 == state) {
-                            player?.pause()
-                            binding.layoutRecommend.cardView.visibility =
-                                View.INVISIBLE
-                            bannerAdapter.currentPlayingPosition = -1
-                            bannerAdapter.notifyDataSetChanged()
-                        } else {
-                            if (2 == state) {
-                                if (player?.isPlaying == false) {
-                                    player?.play()
-                                    binding.layoutRecommend.cardView.visibility =
-                                        View.VISIBLE
-                                    bannerAdapter.currentPlayingPosition =
-                                        bannerPosition
-                                    bannerAdapter.notifyDataSetChanged()
-                                }
-                            }
-                        }
+//                        if (1 == state) {
+//                            bannerAdapter.currentPlayingPosition = -1
+//                            bannerAdapter.notifyDataSetChanged()
+//                        } else {
+//                            if (2 == state) {
+//                                if (player?.isPlaying == false) {
+//                                    bannerAdapter.currentPlayingPosition =
+//                                        bannerPosition
+//                                    bannerAdapter.notifyDataSetChanged()
+//                                }
+//                            }
+//                        }
                     }
                 })
-            binding.layoutRecommend.bannerRecommend.setAdapter(
-                bannerAdapter
-            )
+
             binding.layoutRecommend.tvWatchNow.setOnClickListener {
-                val data = bannerAdapter.getData(bannerPosition)
+                val data =
+                    binding.layoutRecommend.bannerRecommend.getData()[bannerPosition] as VeDetailsRecommendBean.ItemDaraBean
                 watchNow(data, data?.short_play_id)
             }
-            val data = bannerAdapter.getData(0)
+            val data = data.list[0]
             ivCoverRecommendDetail?.let { it1 ->
                 Glide.with(this@MQVAutoWidthActivity).load(data?.image_url)
                     .into(it1)
             }
-            lifecycleScope.launch {
-                player?.setMediaSource(buildMediaSource(data?.video_url.toString()))
-                player?.prepare()
-            }
         } else {
             finish()
         }
@@ -2174,7 +2301,8 @@ class MQVAutoWidthActivity :
     ) {
         binding.layoutRecommend.bannerRecommend.postDelayed({
             if (data?.short_play_id != null) {
-                player?.stop()
+                bannerAdapter.getCurrentPlayerView()?.stop()
+                bannerAdapter.getCurrentPlayerView()?.release()
                 if (short_play_id != null) {
                     shortPlayId = short_play_id
                 }
@@ -2184,5 +2312,63 @@ class MQVAutoWidthActivity :
         binding.layoutRecommend.root.visibility = View.INVISIBLE
     }
 
+    private fun setQualityDialog(revolutionData: VeRevolutionsBean) {
+        val dialog = VipQualityDialog(this, revolutionData).apply {
+            setOnQualityBackOnClickListener(object :
+                VipQualityDialog.SetQualityBackOnClick {
+                override fun qualityBackOnClick(quality: Int) {
+                    RYAction.getMMKV()
+                        .putInt(JActivityAdapter.CONSTANTS_QUALITY, quality)
+                    EventBus.getDefault().post(CONSTANTS_QUALITY_REFRESH)
+                    revolution = quality.toString()
+                    detailRefresh()
+                }
+
+                override fun showActivateOnClick() {
+                    setVipActivateDialog()
+                }
+
+                override fun loginOnClick() {
+                    setLogin()
+                }
+
+            })
+        }
+        dialog.show()
+        dialog.setQualityBackOnClick
+    }
+
+    private fun setVipActivateDialog() {
+        val dialog = VipActivateDialog(this)
+        dialog.show()
+    }
+
+    private var callbackManager: CallbackManager? = null
+    fun setLogin() {
+        val dialog = LoginDialog(this).apply {
+            setOnLoginOnclickListener(object : LoginDialog.LoginOnClick {
+                override fun onLoginFacebook() {
+                    onFacebook()
+                }
+            })
+        }
+        dialog.show()
+        dialog.loginOnclick
+
+    }
+
+    private fun onFacebook() {
+        singleOnClick {
+            LoginManager.getInstance()
+                .logInWithReadPermissions(this, arrayListOf("public_profile", "email"))
+        }
+    }
+
+
+    @Deprecated("Deprecated in Java")
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        callbackManager?.onActivityResult(requestCode, resultCode, data)
+    }
 
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/PSVHomeSearchActivity.kt

@@ -1,15 +1,21 @@
 package com.veloria.now.shortapp.subtractionCroll.bidirectional
 
+import android.Manifest
 import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
+import android.util.Log
 import android.view.KeyEvent
 import android.view.View
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.blankj.utilcode.util.NetworkUtils
@@ -22,12 +28,19 @@ import com.facebook.FacebookException
 import com.facebook.GraphRequest
 import com.facebook.login.LoginManager
 import com.facebook.login.LoginResult
+import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.messaging.FirebaseMessaging
 import com.google.gson.Gson
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
 import com.veloria.now.shortapp.civil.JActivityAdapter.VIDEO_SHORT_PLAY_ID
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.VeNotificationHelper
+import com.veloria.now.shortapp.civil.YFHome.getPackageVersionCode
+import com.veloria.now.shortapp.civil.setShowNotifications
+import com.veloria.now.shortapp.civil.shouldVersionControl
 import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.JsDramaFragmentBinding
@@ -38,9 +51,18 @@ import com.veloria.now.shortapp.subtractionCroll.adminSourceid.NOEditRegisterFra
 import com.veloria.now.shortapp.subtractionCroll.adminSourceid.UColorsAvatarFragment
 import com.veloria.now.shortapp.subtractionCroll.adminSourceid.YYLoginHistoryFragment
 import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.LoginDialog
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.NotificationsDialog
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.VersionControlDialog
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.JService
 import com.veloria.now.shortapp.texturedAsink.LoginDataBean
 import com.veloria.now.shortapp.texturedAsink.VeHomeWatchBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean
+import com.veloria.now.shortapp.texturedAsink.VersionControlBean
+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
@@ -67,6 +89,7 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
     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<Boolean> {
         var responseRemove = true
@@ -198,7 +221,7 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
 
                 it.data?.token?.let { it1 ->
                     RYAction.saveToken(it1)
-                    EventBus.getDefault().post(JActivityAdapter.REFRESH_HOME)
+                    EventBus.getDefault().post(JActivityAdapter.HOME_REFRESH_ME)
                 }
             }
         }
@@ -233,16 +256,37 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
             }
         }
 
-        viewModel.w2aSelfAttributionData.observe(this){
+        viewModel.w2aSelfAttributionData.observe(this) {
             if (needSave) {
                 setAdjustToDetail()
             }
         }
-
-        viewModel.onLineLiveData.observe(this){
+        viewModel.restorePaidData.observe(this) {
+            if (it != null) {
+                it.data?.order_code?.let { it1 -> RYAction.removeOrderString(it1) }
+            }
+        }
+        viewModel.onLineLiveData.observe(this) {
 
         }
 
+        viewModel.versionControlData.observe(this) {
+            if (it != null) {
+                if (it.data?.version_code?.isNotEmpty() == true) {
+                    val toInt = it.data.version_code.toInt()
+                    if (shouldVersionControl() && toInt > getPackageVersionCode(this)) {
+                        setVersionControlDialog(it.data)
+                    }
+                }
+            }
+        }
+
+    }
+
+    fun setVersionControlDialog(versionControlBean: VersionControlBean) {
+        val dialog = VersionControlDialog(this, versionControlBean)
+        dialog.show()
+
     }
 
     private val items = listOf(
@@ -376,7 +420,7 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
                     if (string?.isNotEmpty() == true && NetworkUtils.isConnected()) {
                         val fromJson = Gson().fromJson(string, VeHomeWatchBean::class.java)
                         showHistoryDialog(fromJson)
-                    }else {
+                    } else {
                         binding.dialogWatch.root.visibility = View.INVISIBLE
                     }
                 }, 500
@@ -454,7 +498,10 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
         var episode0: Long = 1323L
         if (episode0 > 52L) {
         }
-
+        path = intent?.getStringExtra("path").toString()
+        short_play_id = intent?.getStringExtra("short_play_id").toString()
+        message_id = intent?.getStringExtra("message_id").toString()
+        title = intent?.getStringExtra("title").toString()
 
 
         manifestShapeSinkExclusive()
@@ -487,12 +534,12 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
                             loginResult.accessToken
                         ) { jsonObject, response ->
                             if (response!!.error != null) {
-                                if (TranslationHelper.getTranslation() != null){
+                                if (TranslationHelper.getTranslation() != null) {
                                     toast(
                                         "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
                                             .plus(".${response.error?.exception.toString()}")
                                     )
-                                }else {
+                                } else {
                                     toast("Facebook Error")
                                 }
                             } else {
@@ -522,24 +569,57 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
                 }
 
                 override fun onCancel() {
-                    if (TranslationHelper.getTranslation() != null){
+                    if (TranslationHelper.getTranslation() != null) {
                         toast("Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_cancel))
-                    }else {
+                    } else {
                         toast("Facebook Cancel")
                     }
                 }
 
                 override fun onError(exception: FacebookException) {
-                    if (TranslationHelper.getTranslation() != null){
+                    if (TranslationHelper.getTranslation() != null) {
                         toast(
                             "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
                                 .plus("n.$exception")
                         )
-                    }else {
+                    } else {
                         toast("Facebook Error")
                     }
                 }
             })
+
+        JActivityAdapter.IS_HOME_SET_NOTIFICATIONS = VeNotificationHelper.isNotification(this)
+        viewModel.setUploadNoticeStatus(
+            VeUploadNotificationBean(
+                if (JActivityAdapter.IS_HOME_SET_NOTIFICATIONS) "1" else "0"
+            )
+        )
+        GoogleApiAvailability.getInstance().makeGooglePlayServicesAvailable(this)
+            .addOnCompleteListener {
+                if (it.isSuccessful) {
+                    askNotificationPermission()
+                }
+            }
+        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)
+
+        viewModel.getVersionControl()
+
     }
 
     private fun stayPrimaryRecommendSearchToast(
@@ -747,6 +827,18 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
             binding.bottomNavBar.updateSelection(0)
             playWhatHeavyPlatformEach(0)
         }
+        if (JActivityAdapter.ACCOUNT_FIREBASE_TOKEN_REFRESH == event) {
+            getFirebaseMessaging()
+        }
+        if (JActivityAdapter.ACCOUNT_OUT_LOGIN == event) {
+            viewModel.loadData()
+            if (TranslationHelper.getTranslation() != null) {
+                toast(
+                    TranslationHelper.getTranslation()?.veloria_network_error_1
+                        ?: getString(R.string.veloria_network_error_1)
+                )
+            }
+        }
     }
 
     private fun restartApplication(context: Context) {
@@ -780,7 +872,20 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
     @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        callbackManager?.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == VeNotificationHelper.VE_NOTIFICATION_REQUEST_CODE) {
+            JActivityAdapter.IS_HOME_SET_NOTIFICATIONS = VeNotificationHelper.isNotification(this)
+            if (JActivityAdapter.IS_HOME_SET_NOTIFICATIONS) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+            }
+            viewModel.setUploadNoticeStatus(
+                VeUploadNotificationBean(
+                    if (JActivityAdapter.IS_HOME_SET_NOTIFICATIONS) "1" else "0"
+                )
+            )
+        } else {
+            callbackManager?.onActivityResult(requestCode, resultCode, data)
+        }
     }
 
 
@@ -845,7 +950,8 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
                             )
                             needSave = true
                             w2aSelfAttribution(clipContent)
-                            RYAction.getMMKV().putString(JActivityAdapter.HOME_DDL_URL, "")
+                            RYAction.getMMKV()
+                                .putString(JActivityAdapter.HOME_DDL_URL, "")
                         }
                     }
                 }
@@ -891,7 +997,7 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
                     if (string?.isNotEmpty() == true && NetworkUtils.isConnected()) {
                         val fromJson = Gson().fromJson(string, VeHomeWatchBean::class.java)
                         showHistoryDialog(fromJson)
-                    }else {
+                    } else {
                         binding.dialogWatch.root.visibility = View.INVISIBLE
                     }
                 }, 500
@@ -982,4 +1088,173 @@ class PSVHomeSearchActivity : AIXTextActivity<JsDramaFragmentBinding, JService>(
         }
     }
 
+    private fun getFirebaseMessaging() {
+        FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+            if (!task.isSuccessful) {
+                return@OnCompleteListener
+            }
+            // Get new FCM registration token
+            val token = task.result
+            // Log and toast
+            Log.d("LOG_TAG", token)
+            viewModel.setFirebaseToken(token)
+        })
+    }
+
+    private fun askNotificationPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (ContextCompat.checkSelfPermission(
+                    this, Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+                viewModel.setUploadNoticeStatus(
+                    VeUploadNotificationBean("1")
+                )
+            } else {
+                if (setShowNotifications()) {
+                    setNotifications()
+                }
+            }
+        } else {
+            if (VeNotificationHelper.isNotification(this)) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+                viewModel.setUploadNoticeStatus(
+                    VeUploadNotificationBean("1")
+                )
+            } else {
+                if (setShowNotifications()) {
+                    setNotifications()
+                }
+            }
+        }
+    }
+
+    private fun setNotifications() {
+        val dialog = NotificationsDialog(this).apply {
+            setOnNotificationClickListener(object :
+                NotificationsDialog.SetNotificationOnClick {
+                override fun notificationOnClick() {
+                    setNotificationOnClick()
+                }
+            })
+        }
+        dialog.show()
+        dialog.setNotificationOnClick
+        dialog.setOnDismissListener {
+            RYAction.getMMKV().putLong(
+                JActivityAdapter.ACCOUNT_DIALOG_TIME_NOTIFICATIONS,
+                System.currentTimeMillis()
+            )
+        }
+    }
+
+    fun setNotificationOnClick() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            setRequestPermission.launch(Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            VeNotificationHelper.setNotification(this)
+        }
+    }
+
+    private val setRequestPermission = registerForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { isGranted: Boolean ->
+        JActivityAdapter.IS_HOME_SET_NOTIFICATIONS = isGranted
+        if (isGranted) {
+            getFirebaseMessaging()
+            viewModel.setOpenNotify()
+            viewModel.setUploadNoticeStatus(
+                VeUploadNotificationBean("1")
+            )
+        } else {
+            VeNotificationHelper.setNotification(this)
+        }
+    }
+
+    private fun setNotificationTo() {
+        if (message_id.isNotBlank() && !message_id.contentEquals("null")) {
+            if ("0" != message_id) {
+                viewModel.setSendReport(message_id, title)
+            }
+        }
+        when (path) {
+            "detail" -> {
+                if (short_play_id.isNotEmpty() && "null" != short_play_id) {
+                    try {
+                        val toInt = short_play_id.toInt()
+                        binding.root.postDelayed({
+                            startActivity(Intent(
+                                this, MQVAutoWidthActivity::class.java
+                            ).apply {
+                                putExtra(
+                                    VIDEO_SHORT_PLAY_ID, toInt
+                                )
+                            })
+                        }, 700)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+
+            "promotion" -> {
+                binding.root.postDelayed({
+                    startActivity(
+                        Intent(
+                            this, VeRewardsActivity::class.java
+                        )
+                    )
+                }, 700)
+            }
+
+            "orderDetail" -> {
+                binding.root.postDelayed({
+                    startActivity(
+                        Intent(
+                            this, VeMyWalletActivity::class.java
+                        )
+                    )
+                }, 700)
+            }
+
+            "feedback" -> {
+                binding.root.postDelayed({
+                    if (message_id.isNotBlank() && message_id != "null") {
+                        RYAction.getMMKV()
+                            .putString(JActivityAdapter.FEEDBACK_DETAIL_ID, message_id)
+                        startActivity(
+                            Intent(
+                                this, VeFeedbackDetailActivity::class.java
+                            )
+                        )
+                    } else {
+                        startActivity(
+                            Intent(
+                                this, VeFeedbackListActivity::class.java
+                            )
+                        )
+                    }
+                }, 700)
+            }
+        }
+    }
+
+    private var path = ""
+    private var short_play_id = ""
+    private var message_id = ""
+    private var title = ""
+
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        path = intent?.getStringExtra("path").toString()
+        short_play_id = intent?.getStringExtra("short_play_id").toString()
+        message_id = intent?.getStringExtra("message_id").toString()
+        title = intent?.getStringExtra("title").toString()
+        setNotificationTo()
+    }
+
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/RBZLatestDeteleActivity.kt

@@ -2,24 +2,28 @@ package com.veloria.now.shortapp.subtractionCroll.bidirectional
 
 import android.annotation.SuppressLint
 import android.graphics.Bitmap
+import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import com.blankj.utilcode.util.NetworkUtils
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.IPlaceBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.LXMService
 import kotlin.math.max
 import kotlin.math.min
 
 
-class RBZLatestDeteleActivity : AIXTextActivity<IPlaceBinding, LXMService>() {
+class RBZLatestDeteleActivity : AIXTextActivity<IPlaceBinding, LXMService>(), NOFfmpeg {
     @Volatile
     var centerTrendPaint_min: Double = 5869.0
 
@@ -168,7 +172,6 @@ class RBZLatestDeteleActivity : AIXTextActivity<IPlaceBinding, LXMService>() {
         println(messageL)
 
 
-
         when (urlString) {
             JActivityAdapter.WEB_VIEW_USER_AGREEMENT -> {
                 var modelE: Float = 6376.0f
@@ -206,6 +209,20 @@ class RBZLatestDeteleActivity : AIXTextActivity<IPlaceBinding, LXMService>() {
                 binding.tvTitle.text = "Veloria"
             }
         }
+
+
+        if (!NetworkUtils.isConnected()) {
+            binding.webView.visibility = View.GONE
+            showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                override fun onRetry(layout: VSNotificationsDefault) {
+                    initView()
+                }
+            })
+            return
+        }
+        binding.webView.visibility = View.VISIBLE
+        showComplete()
         showLoading()
         var helpF: MutableMap<String, Long> = mutableMapOf<String, Long>()
         helpF.put("texturedspenc", 528L)
@@ -502,4 +519,7 @@ class RBZLatestDeteleActivity : AIXTextActivity<IPlaceBinding, LXMService>() {
     }
 
     override fun getViewBinding() = IPlaceBinding.inflate(layoutInflater)
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeFeedbackActivity.kt

@@ -27,13 +27,14 @@ import androidx.lifecycle.lifecycleScope
 import com.blankj.utilcode.util.PermissionUtils
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.ActivityVeFeedbackBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
-import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.other.FeedbackJsBridge
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeFeedbackViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -44,7 +45,8 @@ import org.greenrobot.eventbus.ThreadMode
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
-class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedbackViewModel>() {
+class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedbackViewModel>(),
+    NOFfmpeg {
 
     val viewModel: VeFeedbackViewModel by viewModels()
 
@@ -55,7 +57,7 @@ class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedback
     override fun initView() {
         EventBus.getDefault().register(this)
 
-        if (TranslationHelper.getTranslation() != null){
+        if (TranslationHelper.getTranslation() != null) {
             binding.tvTitle.text = TranslationHelper.getTranslation()?.veloria_my_feedback
         }
 
@@ -138,7 +140,8 @@ class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedback
         binding.webFeedback.webViewClient = object : WebViewClient() {
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
                 super.onPageStarted(view, url, favicon)
-
+                showComplete()
+                binding.webFeedback.visibility = View.VISIBLE
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -152,9 +155,17 @@ class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedback
                 error: WebResourceError?
             ) {
                 super.onReceivedError(view, request, error)
-                if (TranslationHelper.getTranslation() != null){
+                showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                    override fun onRetry(layout: VSNotificationsDefault) {
+                        showLoading()
+                        loadPageUrl(JActivityAdapter.FEEDBACK_URL_INDEX)
+                    }
+                })
+                binding.webFeedback.visibility = View.INVISIBLE
+                if (TranslationHelper.getTranslation() != null) {
                     toast(TranslationHelper.getTranslation()?.veloria_network.toString())
-                }else {
+                } else {
                     toast(getString(R.string.shapeSelected))
                 }
                 hideLoading()
@@ -303,4 +314,8 @@ class VeFeedbackActivity : AIXTextActivity<ActivityVeFeedbackBinding, VeFeedback
         EventBus.getDefault().unregister(this)
     }
 
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeFeedbackDetailActivity.kt

@@ -12,6 +12,7 @@ import android.net.Uri
 import android.os.Build
 import android.util.Base64
 import android.util.Log
+import android.view.View
 import android.webkit.JsPromptResult
 import android.webkit.JsResult
 import android.webkit.WebChromeClient
@@ -27,6 +28,7 @@ import androidx.lifecycle.lifecycleScope
 import com.blankj.utilcode.util.PermissionUtils
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.toast
@@ -38,6 +40,7 @@ import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.other.BaseEventBusBean
 import com.veloria.now.shortapp.other.FeedbackJsBridge
 import com.veloria.now.shortapp.other.FeedbackJsBridgeDetail
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeFeedbackViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -48,7 +51,8 @@ import org.greenrobot.eventbus.ThreadMode
 import java.io.ByteArrayOutputStream
 import java.io.InputStream
 
-class VeFeedbackDetailActivity : AIXTextActivity<ActivityVeFeedbackDetailBinding, VeFeedbackViewModel>() {
+class VeFeedbackDetailActivity : AIXTextActivity<ActivityVeFeedbackDetailBinding, VeFeedbackViewModel>() ,
+    NOFfmpeg {
 
     val viewModel: VeFeedbackViewModel by viewModels()
 
@@ -91,7 +95,8 @@ class VeFeedbackDetailActivity : AIXTextActivity<ActivityVeFeedbackDetailBinding
         binding.webFeedbackDetail.webViewClient = object : WebViewClient() {
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
                 super.onPageStarted(view, url, favicon)
-
+                showComplete()
+                binding.webFeedbackDetail.visibility = View.VISIBLE
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -106,6 +111,14 @@ class VeFeedbackDetailActivity : AIXTextActivity<ActivityVeFeedbackDetailBinding
                 error: WebResourceError?
             ) {
                 super.onReceivedError(view, request, error)
+                showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                    override fun onRetry(layout: VSNotificationsDefault) {
+                        showLoading()
+                        loadPageUrl(JActivityAdapter.FEEDBACK_URL_DETAIL)
+                    }
+                })
+                binding.webFeedbackDetail.visibility = View.INVISIBLE
                 if (TranslationHelper.getTranslation() != null){
                     toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 }else {
@@ -251,4 +264,8 @@ class VeFeedbackDetailActivity : AIXTextActivity<ActivityVeFeedbackDetailBinding
         EventBus.getDefault().unregister(this)
     }
 
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeFeedbackListActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
+import android.view.View
 import android.webkit.WebChromeClient
 import android.webkit.WebResourceError
 import android.webkit.WebResourceRequest
@@ -13,6 +14,7 @@ import android.webkit.WebViewClient
 import androidx.activity.viewModels
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.toast
@@ -21,13 +23,14 @@ import com.veloria.now.shortapp.newsletter.AIXTextActivity
 import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.other.BaseEventBusBean
 import com.veloria.now.shortapp.other.FeedbackJsBridge
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeFeedbackViewModel
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
 class VeFeedbackListActivity :
-    AIXTextActivity<ActivityVeFeedbackListBinding, VeFeedbackViewModel>() {
+    AIXTextActivity<ActivityVeFeedbackListBinding, VeFeedbackViewModel>() , NOFfmpeg {
 
     val viewModel: VeFeedbackViewModel by viewModels()
 
@@ -67,7 +70,8 @@ class VeFeedbackListActivity :
         binding.webFeedbackList.webViewClient = object : WebViewClient() {
             override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) {
                 super.onPageStarted(view, url, favicon)
-
+                showComplete()
+                binding.webFeedbackList.visibility = View.VISIBLE
             }
 
             override fun onPageFinished(view: WebView?, url: String?) {
@@ -82,6 +86,14 @@ class VeFeedbackListActivity :
                 error: WebResourceError?
             ) {
                 super.onReceivedError(view, request, error)
+                showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                    override fun onRetry(layout: VSNotificationsDefault) {
+                        showLoading()
+                        loadPageUrl(JActivityAdapter.FEEDBACK_URL_LIST)
+                    }
+                })
+                binding.webFeedbackList.visibility = View.INVISIBLE
                 if (TranslationHelper.getTranslation() != null){
                     toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 }else {
@@ -123,4 +135,8 @@ class VeFeedbackListActivity :
         EventBus.getDefault().unregister(this)
     }
 
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeLanguageActivity.kt

@@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.blankj.utilcode.util.NetworkUtils
 import com.veloria.now.shortapp.civil.JActivityAdapter
 import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
@@ -33,16 +34,28 @@ class VeLanguageActivity : AIXTextActivity<ActivityVeLanguageBinding, LanguageVi
     override fun getViewBinding() = ActivityVeLanguageBinding.inflate(layoutInflater)
 
     override fun initView() {
+        if (TranslationHelper.getTranslation() != null){
+            binding.tvTitle.text = TranslationHelper.getTranslation()?.veloria_language
+        }
+        binding.ivBack.setOnClickListener {
+            finish()
+        }
+        if (!NetworkUtils.isConnected()) {
+            showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                override fun onRetry(layout: VSNotificationsDefault) {
+                    initView()
+                }
+            })
+            return
+        }
+        showComplete()
         val layoutManager =
             LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
         binding.recyclerView.layoutManager = layoutManager
         mAdapter = LanguageAdapter()
         binding.recyclerView.adapter = mAdapter
 
-        if (TranslationHelper.getTranslation() != null){
-            binding.tvTitle.text = TranslationHelper.getTranslation()?.veloria_language
-        }
-
         showLoading()
         viewModel.getLanguages()
 
@@ -61,6 +74,7 @@ class VeLanguageActivity : AIXTextActivity<ActivityVeLanguageBinding, LanguageVi
                 viewModel.getTranslates(langKey)
             }
         }
+
     }
 
     override fun observeData() {
@@ -85,8 +99,8 @@ class VeLanguageActivity : AIXTextActivity<ActivityVeLanguageBinding, LanguageVi
 
         viewModel.translatesDataBean.observe(this) {
             if (it?.data != null) {
-                RYAction.getMMKV()
-                    .putString(JActivityAdapter.HOME_MAIN_VIDEO_INFO, "")
+//                RYAction.getMMKV()
+//                    .putString(JActivityAdapter.HOME_MAIN_VIDEO_INFO, "")
                 lifecycleScope.launch {
                     withContext(Dispatchers.IO) {
                         TranslationHelper.saveTranslation(it.data.translates)

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeMyWalletActivity.kt

@@ -7,21 +7,24 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.core.content.ContextCompat
 import androidx.viewpager2.widget.ViewPager2
+import com.blankj.utilcode.util.NetworkUtils
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.databinding.ActivityVeMyWalletBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
 import com.veloria.now.shortapp.other.NestedScrollHelper
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeMyWalletViewModel
 import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeMyWalletViewPagerAdapter
 
 class VeMyWalletActivity : AIXTextActivity<ActivityVeMyWalletBinding, VeMyWalletViewModel>(),
-    OnRefreshLoadMoreListener {
+    OnRefreshLoadMoreListener , NOFfmpeg {
 
     val viewModel: VeMyWalletViewModel by viewModels()
 
@@ -41,9 +44,20 @@ class VeMyWalletActivity : AIXTextActivity<ActivityVeMyWalletBinding, VeMyWallet
             binding.tvRechargeText.text = TranslationHelper.getTranslation()?.veloria_recharge
             binding.tvDonateText.text = TranslationHelper.getTranslation()?.veloria_bonus
 
-
         }
 
+        if (!NetworkUtils.isConnected()) {
+            binding.scrollView.visibility = View.GONE
+            showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                override fun onRetry(layout: VSNotificationsDefault) {
+                    initView()
+                }
+            })
+            return
+        }
+        showComplete()
+        binding.scrollView.visibility = View.VISIBLE
         binding.tvTotal.text =
             RYAction.getAllCoinTotal().toString()
         binding.tvRecharge.text =
@@ -175,5 +189,9 @@ class VeMyWalletActivity : AIXTextActivity<ActivityVeMyWalletBinding, VeMyWallet
         viewModel.setLoadMoreAction(binding.viewPager.currentItem)
     }
 
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
+
 
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeRewardsActivity.kt

@@ -1,8 +1,15 @@
 package com.veloria.now.shortapp.subtractionCroll.bidirectional
 
+import android.Manifest
 import android.annotation.SuppressLint
+import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.graphics.Color
+import android.net.Uri
+import android.os.Build
+import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.webkit.WebChromeClient
@@ -11,25 +18,50 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
 import com.blankj.utilcode.util.NetworkUtils
+import com.blankj.utilcode.util.NotificationUtils
+import com.facebook.AccessToken
+import com.facebook.CallbackManager
+import com.facebook.CallbackManager.Factory.create
+import com.facebook.FacebookCallback
+import com.facebook.FacebookException
+import com.facebook.GraphRequest
+import com.facebook.login.LoginManager
+import com.facebook.login.LoginResult
+import com.google.android.gms.tasks.OnCompleteListener
+import com.google.firebase.messaging.FirebaseMessaging
 import com.scwang.smart.refresh.layout.api.RefreshLayout
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener
 import com.veloria.now.shortapp.R
 import com.veloria.now.shortapp.civil.JActivityAdapter
 import com.veloria.now.shortapp.civil.NOFfmpeg
+import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.VeNotificationHelper
+import com.veloria.now.shortapp.civil.YFHome
 import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.ActivityVeRewardsBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
 import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.other.FeedbackJsBridge
+import com.veloria.now.shortapp.other.VeRewardJsBridge
 import com.veloria.now.shortapp.rewards.VSNotificationsDefault
+import com.veloria.now.shortapp.subtractionCroll.avcintraRelock.LoginDialog
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeFeedbackViewModel
+import com.veloria.now.shortapp.texturedAsink.LoginDataBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.json.JSONObject
+import java.util.concurrent.Executors
+import java.util.concurrent.ScheduledExecutorService
 
 class VeRewardsActivity : AIXTextActivity<ActivityVeRewardsBinding, VeFeedbackViewModel>(),
     OnRefreshLoadMoreListener, NOFfmpeg {
@@ -41,20 +73,18 @@ class VeRewardsActivity : AIXTextActivity<ActivityVeRewardsBinding, VeFeedbackVi
     override fun initView() {
         EventBus.getDefault().register(this)
 
+        if (TranslationHelper.getTranslation() != null){
+            binding.tvTitle.text = TranslationHelper.getTranslation()?.veloria_rewards
+        }
         binding.ivBack.setOnClickListener { finish() }
 
         binding.refresh.setOnRefreshLoadMoreListener(this)
         binding.refresh.setEnableLoadMore(false)
         binding.webRewards.setBackgroundColor(Color.TRANSPARENT)
 
-//        ivLeft?.setOnClickListener {
-//            singleClick {
-//                DialogUtils.showStoreHint(requireContext())
-//            }
-//        }
-
         setWebView()
         loadingData()
+        initLogin()
     }
 
     fun loadingData() {
@@ -82,6 +112,31 @@ class VeRewardsActivity : AIXTextActivity<ActivityVeRewardsBinding, VeFeedbackVi
 
     override fun observeData() {
 
+        viewModel.loginLiveData.observe(this) {
+            if (it?.data != null) {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_succeed.toString())
+                }else {
+                    toast("Succeed")
+                }
+                RYAction.getMMKV()
+                    .putString(JActivityAdapter.ACCOUNT_TOKEN, it.data.token)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_ENTER_THE_APP)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_ON_LINE)
+                EventBus.getDefault()
+                    .post(JActivityAdapter.HOME_USER_REFRESH)
+
+                loadingData()
+            }
+        }
+        viewModel.openNotifyLiveData.observe(this){
+            if (it?.data != null) {
+
+            }
+        }
+
     }
 
 
@@ -132,14 +187,22 @@ class VeRewardsActivity : AIXTextActivity<ActivityVeRewardsBinding, VeFeedbackVi
         webSettings.builtInZoomControls = true
         webSettings.displayZoomControls = false
         binding.webRewards.addJavascriptInterface(
-            FeedbackJsBridge(this),
+            VeRewardJsBridge(this),
             "AndroidInterface"
         )
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(event: String) {
-
+        if (JActivityAdapter.HOME_LOGIN == event) {
+            finish()
+        }
+        if (JActivityAdapter.ACCOUNT_WEB_NOTIFICATION == event) {
+            askNotificationPermission()
+        }
+        if (JActivityAdapter.REWARD_LOGIN == event) {
+            setLogin()
+        }
     }
 
     override fun onDestroy() {
@@ -161,4 +224,177 @@ class VeRewardsActivity : AIXTextActivity<ActivityVeRewardsBinding, VeFeedbackVi
         return binding.stateLayout
     }
 
+    private fun askNotificationPermission() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            if (ContextCompat.checkSelfPermission(
+                    this, Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+                loadingData()
+            } else {
+                requestPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
+        } else {
+            if (VeNotificationHelper.isNotification(this)) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+                loadingData()
+            } else {
+                VeNotificationHelper.setNotification(this)
+            }
+        }
+    }
+
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (requestCode == VeNotificationHelper.VE_NOTIFICATION_REQUEST_CODE) {
+            JActivityAdapter.IS_HOME_SET_NOTIFICATIONS = VeNotificationHelper.isNotification(this)
+            if (JActivityAdapter.IS_HOME_SET_NOTIFICATIONS) {
+                getFirebaseMessaging()
+                viewModel.setOpenNotify()
+            }
+            loadingData()
+        }else {
+            callbackManager?.onActivityResult(requestCode, resultCode, data)
+        }
+    }
+
+
+    private val requestPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission(),
+    ) { isGranted: Boolean ->
+        JActivityAdapter.IS_HOME_SET_NOTIFICATIONS = isGranted
+        if (isGranted) {
+            getFirebaseMessaging()
+            viewModel.setOpenNotify()
+            loadingData()
+        } else {
+            openAppNotificationSettings()
+        }
+    }
+
+    private fun openAppNotificationSettings() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val intent = Intent()
+            intent.action = "android.settings.APP_NOTIFICATION_SETTINGS"
+            intent.putExtra(
+                "android.provider.extra.APP_PACKAGE",
+                YFHome.getPackageName()
+            )
+            startActivity(intent)
+        } else {
+            val intent = Intent()
+            intent.action = "android.settings.APPLICATION_DETAILS_SETTINGS"
+            intent.data =
+                Uri.fromParts("package", YFHome.getPackageName(), null)
+            startActivity(intent)
+        }
+    }
+
+    private fun getFirebaseMessaging() {
+        FirebaseMessaging.getInstance().token.addOnCompleteListener(OnCompleteListener { task ->
+            if (!task.isSuccessful) {
+                return@OnCompleteListener
+            }
+            // Get new FCM registration token
+            val token = task.result
+            // Log and toast
+            Log.d("LOG_TAG", token)
+            viewModel.setFirebaseToken(token)
+        })
+    }
+
+    private var callbackManager: CallbackManager? = null
+
+    fun setLogin() {
+        val dialog = LoginDialog(this).apply {
+            setOnLoginOnclickListener(object : LoginDialog.LoginOnClick {
+                override fun onLoginFacebook() {
+                    onFacebook()
+                }
+            })
+        }
+        dialog.show()
+        dialog.loginOnclick
+
+    }
+
+    private fun onFacebook() {
+        singleOnClick {
+            LoginManager.getInstance()
+                .logInWithReadPermissions(this, arrayListOf("public_profile", "email"))
+        }
+    }
+
+
+    fun initLogin(){
+        callbackManager = create()
+        LoginManager.getInstance().registerCallback(callbackManager,
+            object : FacebookCallback<LoginResult> {
+                override fun onSuccess(loginResult: LoginResult) {
+                    val enableButtons = AccessToken.getCurrentAccessToken() != null
+                    if (enableButtons) {
+                        val mGraphRequest = GraphRequest.newMeRequest(
+                            loginResult.accessToken
+                        ) { jsonObject, response ->
+                            if (response!!.error != null) {
+                                if (TranslationHelper.getTranslation() != null) {
+                                    toast(
+                                        "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
+                                            .plus(".${response.error?.exception.toString()}")
+                                    )
+                                } else {
+                                    toast("Facebook Error")
+                                }
+                            } else {
+                                val id = jsonObject?.optString("id")
+                                val name = jsonObject?.optString("name")
+                                val object_pic: JSONObject? = jsonObject!!.optJSONObject("picture")
+                                val object_data = object_pic?.optJSONObject("data")
+                                val photo = object_data?.optString("url")
+                                viewModel.setLeaveApp()
+                                viewModel.setDoLogin(
+                                    LoginDataBean(
+                                        photo.toString(),
+                                        "",
+                                        name.toString(),
+                                        "",
+                                        "facebook",
+                                        id.toString()
+                                    )
+                                )
+                            }
+                        }
+                        val parameters = Bundle()
+                        parameters.putString("fields", "id,name,email,picture")
+                        mGraphRequest.parameters = parameters
+                        mGraphRequest.executeAsync()
+                    }
+                }
+
+                override fun onCancel() {
+                    if (TranslationHelper.getTranslation() != null) {
+                        toast("Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_cancel))
+                    } else {
+                        toast("Facebook Cancel")
+                    }
+                }
+
+                override fun onError(exception: FacebookException) {
+                    if (TranslationHelper.getTranslation() != null) {
+                        toast(
+                            "Facebook ".plus(TranslationHelper.getTranslation()?.veloria_login_exception)
+                                .plus("n.$exception")
+                        )
+                    } else {
+                        toast("Facebook Error")
+                    }
+                }
+            })
+
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/VeStoreActivity.kt

@@ -21,7 +21,9 @@ import com.android.billingclient.api.ProductDetailsResponseListener
 import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.QueryProductDetailsParams
+import com.blankj.utilcode.util.NetworkUtils
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.NOFfmpeg
 import com.veloria.now.shortapp.civil.RYAction
 import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.civil.YFHome
@@ -29,6 +31,7 @@ import com.veloria.now.shortapp.civil.singleOnClick
 import com.veloria.now.shortapp.civil.toast
 import com.veloria.now.shortapp.databinding.ActivityVeStoreBinding
 import com.veloria.now.shortapp.newsletter.AIXTextActivity
+import com.veloria.now.shortapp.rewards.VSNotificationsDefault
 import com.veloria.now.shortapp.subtractionCroll.bidirectional.coordinate.VeStoreViewModel
 import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeStoreCoinAdapter
 import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeStoreCoinBigAdapter
@@ -36,9 +39,14 @@ import com.veloria.now.shortapp.subtractionCroll.modificationsPretch.VeStoreVipA
 import com.veloria.now.shortapp.texturedAsink.VeCreatePayOrderReqBean
 import com.veloria.now.shortapp.texturedAsink.VePayBean
 import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
+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
 
-class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel>() {
+class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel>() , NOFfmpeg {
 
     val viewModel: VeStoreViewModel by viewModels()
 
@@ -52,8 +60,6 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
     private var vipData: VePaySettingsBean.VipBean? = null
     private var coinsData: VePaySettingsBean.CoinsBean? = null
     private var coinsBigData: VePaySettingsBean.CoinsBean? = null
-
-    //    private var bannerAdapter: VeBannerVipPayAdapter? = null
     private var payBeanReq: VePayBean? = null
 
     private var billingClientData: BillingClient? = null
@@ -62,10 +68,14 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
 
     private var isBuy = false
     private var purchaseData: Purchase? = null
+    private val scope = CoroutineScope(Dispatchers.Main)
 
     override fun initView() {
 
         if (TranslationHelper.getTranslation() != null) {
+            binding.tvTitle.text = TranslationHelper.getTranslation()?.veloria_store
+            binding.tvCoinTitle.text = TranslationHelper.getTranslation()?.veloria_coin_buy_title
+            binding.tvRestore.text = TranslationHelper.getTranslation()?.veloria_restore
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 binding.tvTips.text = Html.fromHtml(
                     TranslationHelper.getTranslation()?.veloria_store_tips
@@ -79,13 +89,23 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
                 )
             }
         }
-
-        showLoading()
-
         binding.ivBack.setOnClickListener {
             finish()
         }
 
+        if (!NetworkUtils.isConnected()) {
+            binding.scrollView.visibility = View.GONE
+            showErrorData(object : VSNotificationsDefault.OnRetryListener {
+
+                override fun onRetry(layout: VSNotificationsDefault) {
+                    initView()
+                }
+            })
+            return
+        }
+        showComplete()
+        binding.scrollView.visibility = View.VISIBLE
+        showLoading()
 
         vipAdapter = VeStoreVipAdapter()
         binding.recyclerVip.layoutManager = LinearLayoutManager(this)
@@ -122,7 +142,6 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
             }
         })
 
-
         viewModel.getPaySettingsV3(0, 0)
 
         vipAdapter?.setOnItemClickListener { adapter, view, position ->
@@ -164,15 +183,42 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
 
             setOnPayNowClick()
         }
+        binding.tvRestore.setOnClickListener{
+            singleOnClick {
+                if (RYAction.getOrder().isNotEmpty()
+                ) {
+                    showLoading()
+                    val string = RYAction.getOrder()
+                    scope.launch {
+                        flow {
+                            for (item in string) {
+                                emit(item)
+                            }
+                        }
+                            .onEach { item ->
+                                viewModel.setRestorePaid(item)
+                            }
+                            .debounce(500)
+                            .collect {}
+                    }
+                } else {
+                    if (TranslationHelper.getTranslation() != null){
+                        TranslationHelper.getTranslation()?.veloria_no_restore?.let { it1 -> toast(it1) }
+                    }else {
+                        toast("No orders to restore")
+                    }
+                }
+            }
+        }
 
         initPayData()
     }
 
-
     fun setOnPayNowClick() {
         singleOnClick {
             if (!isConnect) {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
                 } else {
                     toast(getString(R.string.ve_google_pay_error))
                 }
@@ -208,6 +254,7 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
         }
     }
 
+
     override fun observeData() {
         viewModel.PaySettingsV3.observe(this) {
             if (it?.data != null) {
@@ -248,7 +295,6 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
                     binding.tvCoinTitle.visibility = View.GONE
                 }
             }
-
             hideLoading()
         }
         viewModel.createPayOrderData.observe(this) {
@@ -256,13 +302,14 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
                 order_code = it.data.order_code.toString()
                 if (typeOnClick == 0) {
                     coinsData?.android_template_id?.let { it1 -> getProduct(it1) }
-                } else  if (typeOnClick == 1) {
+                } else if (typeOnClick == 1) {
                     vipData?.android_template_id?.let { it1 -> getProduct(it1) }
-                } else  {
+                } else {
                     coinsBigData?.android_template_id?.let { it1 -> getProduct(it1) }
                 }
             } else {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 } else {
                     toast(getString(R.string.shapeSelected))
                 }
@@ -273,6 +320,7 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
         viewModel.googlePaidData.observe(this) {
             if (it?.data != null) {
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_google_pay_success.toString())
                 } else {
                     toast(getString(R.string.ve_google_pay_success))
                 }
@@ -281,12 +329,12 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
             } else {
                 payBeanReq?.let { it1 -> RYAction.saveOrder(it1) }
                 if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
                 } else {
                     toast(getString(R.string.shapeSelected))
                 }
                 hideLoading()
             }
-
         }
         viewModel.userInfo.observe(this) {
             if (it?.data != null) {
@@ -294,8 +342,31 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
             }
             hideLoading()
         }
+        viewModel.restorePaidData.observe(this){
+            if (it != null) {
+                it.data?.order_code?.let { it1 -> RYAction.removeOrderString(it1) }
+                if (RYAction.getOrder().size == 0) {
+                    if (TranslationHelper.getTranslation() != null) {
+                        toast(TranslationHelper.getTranslation()?.veloria_google_pay_success.toString())
+                    } else {
+                        toast(getString(R.string.ve_google_pay_success))
+                    }
+                    viewModel.getUserInfo()
+                    isBuy = true
+                }
+            }else {
+                if (TranslationHelper.getTranslation() != null) {
+                    toast(TranslationHelper.getTranslation()?.veloria_network.toString())
+                } else {
+                    toast(getString(R.string.shapeSelected))
+                }
+                hideLoading()
+            }
+        }
+
     }
 
+
     private fun initPayData() {
         val purchasesUpdatedListener =
             PurchasesUpdatedListener { billingResult, purchases ->
@@ -312,8 +383,14 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
                         }
                     }
 
+                    BillingClient.BillingResponseCode.ITEM_ALREADY_OWNED -> {
+                        queryAndConsumePurchases()
+                        hideLoading()
+                    }
+
                     BillingClient.BillingResponseCode.USER_CANCELED -> {
                         if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_canceled.toString())
                         } else {
                             toast(getString(R.string.ve_google_pay_canceled))
                         }
@@ -322,6 +399,7 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
 
                     else -> {
                         if (TranslationHelper.getTranslation() != null) {
+                            toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
                         } else {
                             toast(getString(R.string.ve_google_pay_error))
                         }
@@ -578,7 +656,7 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
             billingClientData?.consumeAsync(consumeParams, responseListener)
         } else {
             if (TranslationHelper.getTranslation() != null) {
-//                toast(TranslationHelper.getTranslation()?.mireo_g_pay_error.toString())
+                toast(TranslationHelper.getTranslation()?.veloria_google_pay_error.toString())
             } else {
                 toast(getString(R.string.ve_google_pay_error))
             }
@@ -611,6 +689,18 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
             }
         }
 
+    private fun queryAndConsumePurchases() {
+        // 查询所有未消费的购买记录
+        billingClientData?.queryPurchasesAsync(BillingClient.ProductType.INAPP) { billingResult, purchaseList ->
+            if (billingResult.responseCode == BillingClient.BillingResponseCode.OK) {
+                for (purchase in purchaseList) {
+                    consumePurchase(purchase)
+                }
+            }
+        }
+    }
+
+
     override fun onDestroy() {
         super.onDestroy()
         payBeanReq = null
@@ -619,4 +709,8 @@ class VeStoreActivity : AIXTextActivity<ActivityVeStoreBinding, VeStoreViewModel
         System.gc()
     }
 
+    override fun getStatusLayout(): VSNotificationsDefault? {
+        return binding.stateLayout
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/JService.kt

@@ -8,7 +8,12 @@ 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
+import com.veloria.now.shortapp.texturedAsink.VersionControlBean
 
 
 class JService : SStringsHelp() {
@@ -83,7 +88,7 @@ class JService : SStringsHelp() {
     private val _onLineLiveData = MutableLiveData<TStore<Any>?>()
     val onLineLiveData: MutableLiveData<TStore<Any>?> get() = _onLineLiveData
     fun setOnLine() {
-        repository.setOnLine().observeForever {result ->
+        repository.setOnLine().observeForever { result ->
             _onLineLiveData.value = result.getOrNull()
         }
     }
@@ -105,4 +110,51 @@ class JService : SStringsHelp() {
         }
     }
 
+    private val _notificationLiveData = MutableLiveData<TStore<VeUploadNotificationDataBean>?>()
+    val notificationLiveData: MutableLiveData<TStore<VeUploadNotificationDataBean>?> get() = _notificationLiveData
+    fun setUploadNoticeStatus(veUploadNotificationBean: VeUploadNotificationBean) {
+        repository.setUploadNoticeStatus(veUploadNotificationBean)
+            .observeForever { result ->
+                _notificationLiveData.value = result.getOrNull()
+            }
+    }
+
+    private val firebaseTokenLiveData = MutableLiveData<TStore<Any>?>()
+    fun setFirebaseToken(
+        fcm_token: String
+    ) {
+        repository.setFirebaseToken(fcm_token).observeForever { result ->
+            firebaseTokenLiveData.value = result.getOrNull()
+        }
+    }
+
+    private val _openNotifyLiveData = MutableLiveData<TStore<Any>?>()
+    val openNotifyLiveData: MutableLiveData<TStore<Any>?> get() = _openNotifyLiveData
+    fun setOpenNotify() {
+        repository.setOpenNotify().observeForever { result ->
+            _openNotifyLiveData.value = result.getOrNull()
+        }
+    }
+
+    fun setSendReport(message_id: String, title: String) {
+        repository.setSendReport(message_id, title).observeForever {}
+    }
+
+    private val restorePaidLiveData = MutableLiveData<TStore<VePayResBean>?>()
+    val restorePaidData: MutableLiveData<TStore<VePayResBean>?> get() = restorePaidLiveData
+    fun setGooglePaid(vePayBean: VePayBean?) {
+        repository.setGooglePaid(vePayBean).observeForever { result ->
+            restorePaidLiveData.value = result.getOrNull()
+        }
+    }
+
+    private val _versionControlLiveData = MutableLiveData<TStore<VersionControlBean>?>()
+    val versionControlData: MutableLiveData<TStore<VersionControlBean>?> get() = _versionControlLiveData
+
+    fun getVersionControl() {
+        repository.getVersionControl().observeForever { result ->
+            _versionControlLiveData.value = result.getOrNull()
+        }
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/UKBottomCollection.kt

@@ -6,9 +6,12 @@ import com.veloria.now.shortapp.newsletter.SStringsHelp
 import com.veloria.now.shortapp.texturedAsink.PURLockBean
 import com.veloria.now.shortapp.texturedAsink.XAboutBean
 import com.veloria.now.shortapp.highbits.qscaleqlog.PDeteleResource
+import com.veloria.now.shortapp.texturedAsink.DoLoginBean
 import com.veloria.now.shortapp.texturedAsink.KFAFavoritesInterceptorBean
+import com.veloria.now.shortapp.texturedAsink.LoginDataBean
 import com.veloria.now.shortapp.texturedAsink.VeBuyVideoBean
 import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean
+import com.veloria.now.shortapp.texturedAsink.VeRevolutionsBean
 import kotlin.math.min
 import kotlin.math.max
 
@@ -99,4 +102,25 @@ private  var moreSecond_sum: Int = 6970
             _userInfo.value = result.getOrNull()
         }
 
+    private val qualityLiveData = MutableLiveData<TStore<VeRevolutionsBean>?>()
+    val qualityData: MutableLiveData<TStore<VeRevolutionsBean>?> get() = qualityLiveData
+    fun getQualityData() {
+        repository.getQualityData()
+            .observeForever { result ->
+                qualityLiveData.value = result.getOrNull()
+            }
+    }
+
+    fun setLeaveApp() {
+        repository.setLeaveApp().observeForever {}
+    }
+
+    private val _loginLiveData = MutableLiveData<TStore<DoLoginBean>?>()
+    val loginLiveData: MutableLiveData<TStore<DoLoginBean>?> get() = _loginLiveData
+    fun setDoLogin(loginDataBean: LoginDataBean) {
+        repository.setDoLogin(loginDataBean).observeForever { result ->
+            _loginLiveData.value = result.getOrNull()
+        }
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/bidirectional/coordinate/VeFeedbackViewModel.kt

@@ -4,7 +4,11 @@ import androidx.lifecycle.MutableLiveData
 import com.veloria.now.shortapp.highbits.qscaleqlog.ANotifications
 import com.veloria.now.shortapp.newsletter.SStringsHelp
 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.VeNoticeNumBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationBean
+import com.veloria.now.shortapp.texturedAsink.VeUploadNotificationDataBean
 
 
 class VeFeedbackViewModel : SStringsHelp() {
@@ -19,4 +23,42 @@ class VeFeedbackViewModel : SStringsHelp() {
             _noticeNumLiveData.value = result.getOrNull()
         }
     }
+
+
+    private val _notificationLiveData = MutableLiveData<TStore<VeUploadNotificationDataBean>?>()
+    val notificationLiveData: MutableLiveData<TStore<VeUploadNotificationDataBean>?> get() = _notificationLiveData
+    fun setUploadNoticeStatus(veUploadNotificationBean: VeUploadNotificationBean) {
+        repository.setUploadNoticeStatus(veUploadNotificationBean)
+            .observeForever { result ->
+                _notificationLiveData.value = result.getOrNull()
+            }
+    }
+
+    private val firebaseTokenLiveData = MutableLiveData<TStore<Any>?>()
+    fun setFirebaseToken(
+        fcm_token: String
+    ) {
+        repository.setFirebaseToken(fcm_token).observeForever { result ->
+            firebaseTokenLiveData.value = result.getOrNull()
+        }
+    }
+
+    private val _openNotifyLiveData = MutableLiveData<TStore<Any>?>()
+    val openNotifyLiveData: MutableLiveData<TStore<Any>?> get() = _openNotifyLiveData
+    fun setOpenNotify() {
+        repository.setOpenNotify().observeForever { result ->
+            _openNotifyLiveData.value = result.getOrNull()
+        }
+    }
+
+    fun setLeaveApp() {
+        repository.setLeaveApp().observeForever {}
+    }
+    private val _loginLiveData = MutableLiveData<TStore<DoLoginBean>?>()
+    val loginLiveData: MutableLiveData<TStore<DoLoginBean>?> get() = _loginLiveData
+    fun setDoLogin(loginDataBean: LoginDataBean) {
+        repository.setDoLogin(loginDataBean).observeForever { result ->
+            _loginLiveData.value = result.getOrNull()
+        }
+    }
 }

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<TStore<VePayBean>?>()
-    val googlePaidData: MutableLiveData<TStore<VePayBean>?> get() = googlePaidLiveData
+    private val googlePaidLiveData = MutableLiveData<TStore<VePayResBean>?>()
+    val googlePaidData: MutableLiveData<TStore<VePayResBean>?> get() = googlePaidLiveData
     fun setGooglePaid(vePayBean: VePayBean?) {
         repository.setGooglePaid(vePayBean).observeForever { result ->
             googlePaidLiveData.value = result.getOrNull()
@@ -62,4 +63,13 @@ class VeStoreViewModel : SStringsHelp() {
         repository.getUserInfo().observeForever { result ->
             _userInfo.value = result.getOrNull()
         }
+
+    private val restorePaidLiveData = MutableLiveData<TStore<VePayResBean>?>()
+    val restorePaidData: MutableLiveData<TStore<VePayResBean>?> get() = restorePaidLiveData
+    fun setRestorePaid(vePayBean: VePayBean?) {
+        repository.setGooglePaid(vePayBean).observeForever { result ->
+            restorePaidLiveData.value = result.getOrNull()
+        }
+    }
+
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/GFFavorites.kt

@@ -7,21 +7,20 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.civil.getTimeAgoDetailed
+import com.veloria.now.shortapp.databinding.IDisplayTrendsBinding
 import com.veloria.now.shortapp.newsletter.XNBackground
 import com.veloria.now.shortapp.texturedAsink.TMainExtractionBean
-import com.veloria.now.shortapp.databinding.IDisplayTrendsBinding
-import com.veloria.now.shortapp.civil.getTimeAgoDetailed
-import kotlin.math.min
-import kotlin.math.max
 
 
 class GFFavorites :
     BaseQuickAdapter<TMainExtractionBean.DataListBean, GFFavorites.VH>() {
-@Volatile
- var default_0mTabBingeSum: Long = 3471L
-@Volatile
- var freeRetrofitMark: Int = 5934
+    @Volatile
+    var default_0mTabBingeSum: Long = 3471L
 
+    @Volatile
+    var freeRetrofitMark: Int = 5934
 
 
     var collectionOnClick: CollectionOnClick? = null
@@ -38,90 +37,96 @@ class GFFavorites :
         ),
     ) : RecyclerView.ViewHolder(binding.root)
 
-    
-private fun playDramaAppendModeForeverTest(lifecycleHttp: MutableList<Long>, secondsStarted: MutableMap<String,Double>) :MutableMap<String,Float> {
-     var durationFailure:MutableList<Boolean> = mutableListOf<Boolean>()
-     var setupMin__6:MutableList<Long> = mutableListOf<Long>()
-     var toastCurrent:MutableMap<String,Boolean> = mutableMapOf<String,Boolean>()
-     println(toastCurrent)
-    var correspondentsTableinit:MutableMap<String,Float> = mutableMapOf<String,Float>()
-    for(clips in toastCurrent) {
-        correspondentsTableinit.put("multiframe", 0.0f)
-    
-}
 
-    return correspondentsTableinit
+    private fun playDramaAppendModeForeverTest(
+        lifecycleHttp: MutableList<Long>,
+        secondsStarted: MutableMap<String, Double>
+    ): MutableMap<String, Float> {
+        var durationFailure: MutableList<Boolean> = mutableListOf<Boolean>()
+        var setupMin__6: MutableList<Long> = mutableListOf<Long>()
+        var toastCurrent: MutableMap<String, Boolean> = mutableMapOf<String, Boolean>()
+        println(toastCurrent)
+        var correspondentsTableinit: MutableMap<String, Float> = mutableMapOf<String, Float>()
+        for (clips in toastCurrent) {
+            correspondentsTableinit.put("multiframe", 0.0f)
 
-}
+        }
+
+        return correspondentsTableinit
+
+    }
 
 
-override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
-var scheduling_r = mutableListOf<Long>()
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        var scheduling_r = mutableListOf<Long>()
 
-var elisionUnhighlight =  this.playDramaAppendModeForeverTest(scheduling_r,mutableMapOf<String,Double>())
+        var elisionUnhighlight =
+            this.playDramaAppendModeForeverTest(scheduling_r, mutableMapOf<String, Double>())
 
-      var elisionUnhighlight_len:Int = elisionUnhighlight.size
-      for(object_i in elisionUnhighlight) {
-          println(object_i.key)
-          println(object_i.value)
-      }
+        var elisionUnhighlight_len: Int = elisionUnhighlight.size
+        for (object_i in elisionUnhighlight) {
+            println(object_i.key)
+            println(object_i.value)
+        }
 
-println(elisionUnhighlight)
+        println(elisionUnhighlight)
 
 
-            var dashboardI:String = "rscc"
-             if (dashboardI.length > 171) {}
-            println(dashboardI)
+        var dashboardI: String = "rscc"
+        if (dashboardI.length > 171) {
+        }
+        println(dashboardI)
 
 
         return VH(parent)
     }
 
-    
-private fun liveOutputCallAnyEpisodeApplication(chooseSeries: Long) :Long {
-     var responseSeekbar = mutableListOf<Float>()
-     println(responseSeekbar)
-     var eventFree:Double = 1094.0
-     var seekbarHttp:String = "kanna"
-     println(seekbarHttp)
-     var iconSkewed:Int = 9958
-     println(iconSkewed)
-    var armthFreadSqrt:Long = 5210L
-    eventFree = eventFree
-    iconSkewed -= iconSkewed
 
-    return armthFreadSqrt
+    private fun liveOutputCallAnyEpisodeApplication(chooseSeries: Long): Long {
+        var responseSeekbar = mutableListOf<Float>()
+        println(responseSeekbar)
+        var eventFree: Double = 1094.0
+        var seekbarHttp: String = "kanna"
+        println(seekbarHttp)
+        var iconSkewed: Int = 9958
+        println(iconSkewed)
+        var armthFreadSqrt: Long = 5210L
+        eventFree = eventFree
+        iconSkewed -= iconSkewed
 
-}
+        return armthFreadSqrt
+
+    }
 
 
-override fun onBindViewHolder(
+    override fun onBindViewHolder(
         holder: VH,
         position: Int,
         item: TMainExtractionBean.DataListBean?
     ) {
 
-var splittingSigning:Long =  this.liveOutputCallAnyEpisodeApplication(1455L)
+        var splittingSigning: Long = this.liveOutputCallAnyEpisodeApplication(1455L)
 
-      var interpolator_splittingSigning: Int = splittingSigning.toInt()
-      if (splittingSigning >= 2L) {
-             println(splittingSigning)
-      }
+        var interpolator_splittingSigning: Int = splittingSigning.toInt()
+        if (splittingSigning >= 2L) {
+            println(splittingSigning)
+        }
 
-println(splittingSigning)
+        println(splittingSigning)
 
 
-            var loading6:Int = 1947
-             if (loading6 > 87) {}
+        var loading6: Int = 1947
+        if (loading6 > 87) {
+        }
 
 
-this.default_0mTabBingeSum = 9956L
+        this.default_0mTabBingeSum = 9956L
 
-   this.freeRetrofitMark = 4850
+        this.freeRetrofitMark = 4850
 
 
         if (null != item) {
-            var transparent1:Boolean = true
+            var transparent1: Boolean = true
 
 
             Glide.with(XNBackground.instance)
@@ -129,54 +134,75 @@ this.default_0mTabBingeSum = 9956L
                 .placeholder(R.mipmap.collection_trending_recommend)
                 .error(R.mipmap.collection_trending_recommend)
                 .into(holder.binding.ivImage2)
-            var factoryu:Int = 4239
-             if (factoryu > 62) {}
+            var factoryu: Int = 4239
+            if (factoryu > 62) {
+            }
 
 
 
             holder.binding.tvName2.text = item.name
-            var progressJ:Long = 3354L
-             while (progressJ >= 27L) { break }
+            var progressJ: Long = 3354L
+            while (progressJ >= 27L) {
+                break
+            }
+
+            if (TranslationHelper.getTranslation() != null) {
+                holder.binding.tvSeries.text = TranslationHelper.replace(
+                    TranslationHelper.getTranslation()?.mireo_EP.toString(),
+                    item.current_episode
+                )
+                holder.binding.tvSeriesAll.text = "/".plus(
+                    TranslationHelper.replace(
+                        TranslationHelper.getTranslation()?.veloria_all_episodes.toString(),
+                        item.episode_total.toString()
+                    )
+                )
+            } else {
+                holder.binding.tvSeries.text =
+                    "EP.".plus(item.current_episode)
+                holder.binding.tvSeriesAll.text = "/EP.".plus(item.episode_total)
+            }
+            var uploadp: Int = 6616
+            while (uploadp >= 157) {
+                break
+            }
 
 
-
-            holder.binding.tvSeries.text =
-                "EP.".plus(item.current_episode)
-            var uploadp:Int = 6616
-             while (uploadp >= 157) { break }
-
-
-            holder.binding.tvSeriesAll.text = "/EP.".plus(item.episode_total)
-            var indexJ:Long = 6061L
-             if (indexJ > 169L) {}
+            var indexJ: Long = 6061L
+            if (indexJ > 169L) {
+            }
 
 
 
             if (item.is_collect == 1) {
-            var login_:Float = 4781.0f
-             while (login_ >= 30.0f) { break }
+                var login_: Float = 4781.0f
+                while (login_ >= 30.0f) {
+                    break
+                }
 
 
                 holder.binding.ivCollection.setImageResource(R.mipmap.detele_rewards_episode)
             } else {
-            var tabA:Float = 2603.0f
-             if (tabA <= 39.0f) {}
+                var tabA: Float = 2603.0f
+                if (tabA <= 39.0f) {
+                }
 
 
                 holder.binding.ivCollection.setImageResource(R.mipmap.episode_utils)
             }
 
             if (!item.updated_at.isNullOrEmpty()) {
-            var outV:Float = 6386.0f
-             if (outV == 10.0f) {}
+                var outV: Float = 6386.0f
+                if (outV == 10.0f) {
+                }
 
 
-                holder.binding.tvTime.text = getTimeAgoDetailed(item.updated_at)
+                holder.binding.tvTime.text = item.updated_at
             }
 
             holder.binding.ivCollection.setOnClickListener {
-            var processa:Boolean = false
-            println(processa)
+                var processa: Boolean = false
+                println(processa)
 
 
                 item.let { it1 -> collectionOnClick?.collection(position, it1) }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeBannerRecommendAdapter.kt

@@ -1,77 +1,77 @@
 package com.veloria.now.shortapp.subtractionCroll.modificationsPretch
 
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.cardview.widget.CardView
-import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.newsletter.XNBackground
+import com.veloria.now.shortapp.rewards.BannerPlayerView
 import com.veloria.now.shortapp.texturedAsink.VeDetailsRecommendBean
-import com.youth.banner.adapter.BannerAdapter
+import com.zhpan.bannerview.BaseBannerAdapter
+import com.zhpan.bannerview.BaseViewHolder
 
-class VeBannerRecommendAdapter(items: List<VeDetailsRecommendBean.ItemDaraBean?>?) :
-    BannerAdapter<VeDetailsRecommendBean.ItemDaraBean, VeBannerRecommendAdapter.BannerViewHolder>(
-        items
-    ) {
+class VeBannerRecommendAdapter :
+    BaseBannerAdapter<VeDetailsRecommendBean.ItemDaraBean>() {
     var currentPlayingPosition = 0
 
-    override fun onCreateHolder(parent: ViewGroup, viewType: Int): BannerViewHolder {
-        val view: View = LayoutInflater.from(parent.context)
-            .inflate(R.layout.item_ve_banner_recommend, parent, false)
-        view.layoutParams = ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            ViewGroup.LayoutParams.MATCH_PARENT
-        )
-        return BannerViewHolder(view)
+    private var currentBannerPlayerView: BannerPlayerView? = null
+
+    fun getCurrentPlayerView(): BannerPlayerView? {
+        return currentBannerPlayerView
     }
 
-    override fun onBindView(
-        holder: BannerViewHolder?,
+    override fun bindData(
+        holder: BaseViewHolder<VeDetailsRecommendBean.ItemDaraBean>?,
         data: VeDetailsRecommendBean.ItemDaraBean?,
         position: Int,
-        size: Int
+        pageSize: Int
     ) {
         val imageView =
-            holder?.view?.findViewById<AppCompatImageView>(R.id.ic_icon_banner)
+            holder?.findViewById<AppCompatImageView>(R.id.ic_icon_banner)
         if (imageView != null) {
-            Glide.with(holder.view.context!!)
+            Glide.with(XNBackground.instance)
                 .load(data?.image_url)
                 .placeholder(R.mipmap.collection_trending_recommend)
                 .into(imageView)
         }
         val tvName =
-            holder?.view?.findViewById<AppCompatTextView>(R.id.tv_name)
-        tvName?.text = data?.name
-        val cardView =
-            holder?.view?.findViewById<CardView>(R.id.cardView)
-        if (position == currentPlayingPosition) {
-            cardView?.visibility = View.INVISIBLE
-        } else {
-            cardView?.visibility = View.VISIBLE
-        }
-
+            holder?.findViewById<AppCompatTextView>(R.id.tv_name)
         val tvRevenge =
-            holder?.view?.findViewById<AppCompatTextView>(R.id.tv_revenge)
+            holder?.findViewById<AppCompatTextView>(R.id.tv_revenge)
         val tvRevenge1 =
-            holder?.view?.findViewById<AppCompatTextView>(R.id.tv_revenge_1)
+            holder?.findViewById<AppCompatTextView>(R.id.tv_revenge_1)
+        tvName?.text = data?.name
+        val bannerPlayerView = holder?.findViewById<BannerPlayerView>(R.id.banner_player)
+        if (position == currentPlayingPosition) {
+            imageView?.visibility = View.INVISIBLE
+            bannerPlayerView?.setPlayInfo(data)
+            currentBannerPlayerView = bannerPlayerView
+            tvName?.visibility = View.VISIBLE
 
-        tvRevenge?.visibility = View.GONE
-        tvRevenge1?.visibility = View.GONE
-        if (null != data?.category && data.category.isNotEmpty()) {
-            tvRevenge?.text = data.category[0]
-            tvRevenge?.visibility = View.VISIBLE
-            if (data.category.size > 1) {
-                tvRevenge1?.text = data.category[1]
-                tvRevenge1?.visibility = View.VISIBLE
+            tvRevenge?.visibility = View.GONE
+            tvRevenge1?.visibility = View.GONE
+            if (null != data?.category && data.category.isNotEmpty()) {
+                tvRevenge?.text = data.category[0]
+                tvRevenge?.visibility = View.VISIBLE
+                if (data.category.size > 1) {
+                    tvRevenge1?.text = data.category[1]
+                    tvRevenge1?.visibility = View.VISIBLE
+                }
             }
+
+        } else {
+            imageView?.visibility = View.VISIBLE
+            bannerPlayerView?.stop()
+            tvName?.visibility = View.GONE
+            tvRevenge?.visibility = View.GONE
+            tvRevenge1?.visibility = View.GONE
         }
+
+
     }
 
-    inner class BannerViewHolder(var view: View) : RecyclerView.ViewHolder(
-        view
-    )
-
+    override fun getLayoutId(viewType: Int): Int {
+        return R.layout.item_ve_banner_recommend;
+    }
 }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeCustomerBuyRecordAdapter.kt

@@ -30,7 +30,11 @@ class VeCustomerBuyRecordAdapter :
         item: VeCustomerBuyRecordsBean.DataBean?
     ) {
         if (null != item) {
-            holder.binding.tvBalance.text = "EP.".plus(item.episode).plus(" ").plus(item.name)
+            if (TranslationHelper.getTranslation()!=null){
+                holder.binding.tvBalance.text = TranslationHelper.replace(TranslationHelper.getTranslation()?.mireo_EP.toString(),item.episode.toString()).plus(" ").plus(item.name)
+            }else{
+                holder.binding.tvBalance.text = "EP.".plus(item.episode).plus(" ").plus(item.name)
+            }
             holder.binding.tvName.text = TranslationHelper.getTranslation()
                 ?.let { TranslationHelper.getTranslation()?.veloria_purchase_single_episode }
                 ?: "Purchase Single Episode"

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeStoreCoinAdapter.kt

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.databinding.ItemVeStoreCoinBinding
 import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
 import kotlin.math.floor
@@ -36,7 +37,15 @@ class VeStoreCoinAdapter :
             holder.binding.tvCoins.text = "+".plus(item.coins.toString())
             holder.binding.tvPrice.text = item.price_google
             if (item.send_coins > 0) {
-                holder.binding.tvBonus.text = "+".plus(item.send_coins).plus(" Bonus")
+                if (TranslationHelper.getTranslation() != null) {
+                    holder.binding.tvBonus.text = TranslationHelper.replace(
+                        TranslationHelper.getTranslation()?.veloria_bonus_count_text.toString(),
+                        item.send_coins.toString()
+                    )
+
+                } else {
+                    holder.binding.tvBonus.text = "+".plus(item.send_coins).plus(" Bonus")
+                }
             } else {
                 holder.binding.tvBonus.text = ""
             }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeStoreCoinBigAdapter.kt

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.chad.library.adapter4.BaseQuickAdapter
 import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.TranslationHelper
 import com.veloria.now.shortapp.databinding.ItemVeStoreCoinBigBinding
 import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
 import kotlin.math.floor
@@ -36,7 +37,14 @@ class VeStoreCoinBigAdapter :
             holder.binding.tvCoins.text = "+".plus(item.coins.toString())
             holder.binding.tvPrice.text = item.price_google
             if (item.send_coins > 0) {
-                holder.binding.tvBonus.text = "+".plus(item.send_coins).plus(" Bonus")
+                if (TranslationHelper.getTranslation() != null) {
+                    holder.binding.tvBonus.text = TranslationHelper.replace(
+                        TranslationHelper.getTranslation()?.veloria_bonus_count_text.toString(),
+                        item.send_coins.toString()
+                    )
+                } else {
+                    holder.binding.tvBonus.text = "+".plus(item.send_coins).plus(" Bonus")
+                }
             } else {
                 holder.binding.tvBonus.text = ""
             }

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeStoreVipAdapter.kt

@@ -36,9 +36,11 @@ class VeStoreVipAdapter :
         if (null != item) {
             holder.binding.tvDay.text = item.brief
             holder.binding.tvMoney.text = item.price_google
-            holder.binding.tvMoneyDay.text = "/".plus(item.vip_type_key)
+            holder.binding.tvMoneyDay.text = "/".plus(item.short_type)
             holder.binding.tvDescription.text = item.description
-            holder.binding.tvInfo.text = item.auto_sub
+            if (TranslationHelper.getTranslation() != null) {
+                holder.binding.tvInfo.text = TranslationHelper.getTranslation()?.veloria_store_auto_renew
+            }
             if ((item.send_coins ?: 0) > 0) {
                 holder.binding.tvExtra.text =
                     "+".plus(
@@ -48,7 +50,7 @@ class VeStoreVipAdapter :
 
                 if (TranslationHelper.getTranslation() != null) {
                     holder.binding.tvExpire.text =
-                        TranslationHelper.getTranslation()?.veloria_donate_expire?.let {
+                        TranslationHelper.getTranslation()?.veloria_store_donate_coins_ios?.let {
                             TranslationHelper.replace(
                                 it,
                                 item.send_coin_ttl.toString()
@@ -66,6 +68,7 @@ class VeStoreVipAdapter :
                 holder.binding.tvExpire.visibility = View.GONE
             }
 
+
             if (currentPosition == position) {
                 holder.binding.tvSelect.visibility = View.VISIBLE
             } else {

app/src/main/java/com/veloria/now/shortapp/subtractionCroll/modificationsPretch/VeVipSplashAdapter.kt

@@ -0,0 +1,100 @@
+package com.veloria.now.shortapp.subtractionCroll.modificationsPretch
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.chad.library.adapter4.BaseQuickAdapter
+import com.veloria.now.shortapp.R
+import com.veloria.now.shortapp.civil.TranslationHelper
+import com.veloria.now.shortapp.databinding.ItemVeStoreVipBinding
+import com.veloria.now.shortapp.databinding.ItemVeVipSplashBinding
+import com.veloria.now.shortapp.texturedAsink.VePaySettingsBean
+
+class VeVipSplashAdapter :
+    BaseQuickAdapter<VePaySettingsBean.VipBean, VeVipSplashAdapter.VH>() {
+
+    var currentPosition = -1
+
+    class VH(
+        parent: ViewGroup,
+        val binding: ItemVeVipSplashBinding = ItemVeVipSplashBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false
+        ),
+    ) : RecyclerView.ViewHolder(binding.root)
+
+    override fun onCreateViewHolder(context: Context, parent: ViewGroup, viewType: Int): VH {
+        return VH(parent)
+    }
+
+    override fun onBindViewHolder(
+        holder: VH,
+        position: Int,
+        item: VePaySettingsBean.VipBean?
+    ) {
+        if (null != item) {
+            holder.binding.tvMoney.text = item.price_google
+            holder.binding.tvMoneyDay.text = "/".plus(item.short_type)
+            if ((item.send_coins ?: 0) > 0) {
+                holder.binding.tvExtra.text =
+                    "+".plus(
+                        TranslationHelper.getTranslation()
+                            ?.let { TranslationHelper.getTranslation()?.veloria_extra } ?: "Extra")
+                        .plus(" ").plus(item.send_coins)
+
+                holder.binding.tvExtra.visibility = View.VISIBLE
+            } else {
+                holder.binding.tvExtra.visibility = View.GONE
+            }
+            if (position == 0){
+                holder.binding.tvHot.visibility = View.VISIBLE
+            }else {
+                holder.binding.tvHot.visibility = View.GONE
+            }
+
+            if (currentPosition == position) {
+                holder.binding.tvSelect.visibility = View.VISIBLE
+            } else {
+                holder.binding.tvSelect.visibility = View.GONE
+            }
+
+
+            when (item.vip_type_key) {
+                "month" -> {
+                    holder.binding.root.setBackgroundResource(R.mipmap.iv_dialog_vip_splash_vip_1)
+                    holder.binding.tvMoney.setTextColor(Color.parseColor("#414867"))
+                    holder.binding.tvMoneyDay.setTextColor(Color.parseColor("#414867"))
+                    holder.binding.tvExtra.setTextColor(Color.parseColor("#303962"))
+                    holder.binding.tvExtra.setBackgroundResource(R.drawable.bg_store_vip_text_1)
+                }
+
+                "week" -> {
+                    holder.binding.root.setBackgroundResource(R.mipmap.iv_dialog_vip_splash_vip_2)
+                    holder.binding.tvMoney.setTextColor(Color.parseColor("#416767"))
+                    holder.binding.tvMoneyDay.setTextColor(Color.parseColor("#416767"))
+                    holder.binding.tvExtra.setTextColor(Color.parseColor("#416767"))
+                    holder.binding.tvExtra.setBackgroundResource(R.drawable.bg_store_vip_text_2)
+                }
+
+                "quarter" -> {
+                    holder.binding.root.setBackgroundResource(R.mipmap.iv_dialog_vip_splash_vip_3)
+                    holder.binding.tvMoney.setTextColor(Color.parseColor("#5F1EB9"))
+                    holder.binding.tvMoneyDay.setTextColor(Color.parseColor("#5F1EB9"))
+                    holder.binding.tvExtra.setTextColor(Color.parseColor("#5F1EB9"))
+                    holder.binding.tvExtra.setBackgroundResource(R.drawable.bg_store_vip_text_3)
+                }
+
+                "year" -> {
+                    holder.binding.root.setBackgroundResource(R.mipmap.iv_dialog_vip_splash_vip_4)
+                    holder.binding.tvMoney.setTextColor(Color.parseColor("#573D31"))
+                    holder.binding.tvMoneyDay.setTextColor(Color.parseColor("#573D31"))
+                    holder.binding.tvExtra.setTextColor(Color.parseColor("#573D31"))
+                    holder.binding.tvExtra.setBackgroundResource(R.drawable.bg_store_vip_text_4)
+                }
+            }
+        }
+
+    }
+}

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
+)

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VeRevolutionsBean.kt

@@ -0,0 +1,11 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class VeRevolutionsBean(
+    val list: List<RevolutionItemBean>
+) {
+    data class RevolutionItemBean(
+        val can_check: Boolean,
+        val condition: Int,
+        val value: Int
+    )
+}

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VeRewardJsBean.kt

@@ -0,0 +1,8 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class VeRewardJsBean (
+    val token: String,
+    val time_zone: String,
+    val lang: String,
+    val type: String
+)

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VeTranslationBean.kt

@@ -16,7 +16,38 @@ class VeTranslationBean(
     )
 
     data class Translation(
+        val veloria_update_title : String,
+        val veloria_update_now : String,
+        val veloria_no_restore : String,
+        val veloria_store_donate_coins_ios : String,
+        val veloria_coin_buy_title : String,
+        val mireo_EP : String,
+        val veloria_try_again : String,
+        val veloria_network_error_1 : String,
+        val veloria_search_results : String,
+        val veloria_watch_now : String,
+        val veloria_detail_recommand_title : String,
+        val veloria_bonus_count_text : String,
         val veloria_donate_expire : String,
+        val veloria_open_notice_at_watch_video : String,
+        val veloria_allow : String,
+        val veloria_open_notice_alert_text : String,
+        val veloria_favorites : String,
+        val veloria_more : String,
+        val veloria_week : String,
+        val veloria_month : String,
+        val veloria_quarter : String,
+        val veloria_year : String,
+        val veloria_go : String,
+        val veloria_later : String,
+        val veloria_vip_activate_content : String,
+        val veloria_vip_activate_title : String,
+        val veloria_vip_splash_onclick : String,
+        val veloria_vip_splash_content : String,
+        val veloria_vip_splash_title : String,
+        val veloria_google_pay_success : String,
+        val veloria_google_pay_canceled : String,
+        val veloria_google_pay_error : String,
         val veloria_not_found_string : String,
         val veloria_not_found : String,
         val veloria_episode : String,
@@ -62,6 +93,7 @@ class VeTranslationBean(
         val veloria_recersal_of_fate : String,
         val veloria_extra : String,
         val veloria_store_tips : String,
+        val veloria_unlock : String,
         val veloria_your_coins : String,
         val veloria_get_more_coins : String,
         val veloria_buy_now : String,
@@ -97,6 +129,7 @@ class VeTranslationBean(
         val veloria_order_record : String,
         val veloria_rewards : String,
         val veloria_store : String,
+        val veloria_restore : String,
         val veloria_wallet : String,
         val veloria_bonus : String,
         val veloria_coins : String,

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VeUploadNotificationBean.kt

@@ -0,0 +1,3 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class VeUploadNotificationBean (val is_open_notice: String)

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VeUploadNotificationDataBean.kt

@@ -0,0 +1,3 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class VeUploadNotificationDataBean (val coins: String)

app/src/main/java/com/veloria/now/shortapp/texturedAsink/VersionControlBean.kt

@@ -0,0 +1,7 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class VersionControlBean (
+    val description: String,
+    val version_code: String,
+    val version_name: String
+)

app/src/main/java/com/veloria/now/shortapp/texturedAsink/WatchVideoJsonBean.kt

@@ -0,0 +1,14 @@
+package com.veloria.now.shortapp.texturedAsink
+
+class WatchVideoJsonBean(
+    val data: Data?,
+    val is_complete: Boolean,
+    val is_show: Int,
+    val type: String
+) {
+
+    data class Data(
+        val activity_id: Int,
+        val short_play_id: Int?
+    )
+}

app/src/main/res/drawable/bg_coin_right_hot.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#BE0069" />
+    <corners android:topRightRadius="@dimen/dp_10" android:bottomLeftRadius="@dimen/dp_10" />
+</shape>

app/src/main/res/drawable/bg_quality_login.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#7C174F" />
+    <corners android:topLeftRadius="@dimen/dp_7"
+        android:topRightRadius="@dimen/dp_7"
+        android:bottomLeftRadius="@dimen/dp_7"/>
+</shape>

app/src/main/res/drawable/bg_quality_vip.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <gradient  android:endColor="#FCCB6D" android:startColor="#FDDDA2" android:type="linear" />
+            <corners android:topLeftRadius="@dimen/dp_7"
+                android:topRightRadius="@dimen/dp_7"
+                android:bottomLeftRadius="@dimen/dp_7" />
+        </shape>
+    </item>
+</selector>

app/src/main/res/drawable/bg_upload_version.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#A3F0DE" />
+    <corners android:radius="@dimen/dp_15"/>
+</shape>

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

@@ -57,13 +57,23 @@
         tools:text="1" />
 
 
-    <WebView
-        android:id="@+id/web_feedback"
+    <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+        android:id="@+id/stateLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_back" />
+        app:layout_constraintTop_toBottomOf="@+id/iv_back"
+        >
+        <WebView
+            android:id="@+id/web_feedback"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+             />
+
+    </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
+
+
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -39,10 +39,17 @@
         app:layout_constraintTop_toBottomOf="@+id/iv_back"
         app:srlEnablePreviewInEditMode="false">
 
-        <WebView
-            android:id="@+id/web_feedback_detail"
+        <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+            android:id="@+id/stateLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent">
+
+            <WebView
+                android:id="@+id/web_feedback_detail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
 
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 

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

@@ -39,10 +39,18 @@
         app:layout_constraintTop_toBottomOf="@+id/iv_back"
         app:srlEnablePreviewInEditMode="false">
 
-        <WebView
-            android:id="@+id/web_feedback_list"
+        <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+            android:id="@+id/stateLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"
+            >
+
+            <WebView
+                android:id="@+id/web_feedback_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
+
 
     </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 

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

@@ -29,180 +29,189 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/iv_back" />
 
-    <com.scwang.smart.refresh.layout.SmartRefreshLayout
-        android:id="@+id/refresh"
+    <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+        android:id="@+id/stateLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginBottom="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/iv_back">
 
-        <androidx.core.widget.NestedScrollView
-            android:id="@+id/scrollView"
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true">
+            android:layout_marginBottom="@dimen/dp_10"
+            >
 
-            <androidx.constraintlayout.widget.ConstraintLayout
+            <androidx.core.widget.NestedScrollView
+                android:id="@+id/scrollView"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:fillViewport="true">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/cl_data"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_15"
-                    android:layout_marginTop="@dimen/dp_15"
-                    android:background="@drawable/e_adapter_place"
-                    android:padding="@dimen/dp_10"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
+                    android:layout_height="match_parent">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_total_text"
-                        android:layout_width="wrap_content"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_data"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_5"
-                        android:text="Total Coins"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_12"
+                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:background="@drawable/e_adapter_place"
+                        android:padding="@dimen/dp_10"
                         app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_total"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_8"
-                        android:drawableStart="@mipmap/iv_coins"
-                        android:drawablePadding="@dimen/dp_5"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="999"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_20"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_total_text" />
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_total_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_5"
+                            android:text="Total Coins"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_12"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
 
-                    <View
-                        android:id="@+id/view"
-                        android:layout_width="@dimen/dp_1"
-                        android:layout_height="@dimen/dp_35"
-                        android:layout_marginTop="@dimen/dp_25"
-                        android:background="@color/white30"
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_total"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_8"
+                            android:drawableStart="@mipmap/iv_coins"
+                            android:drawablePadding="@dimen/dp_5"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="999"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_20"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_total_text" />
+
+                        <View
+                            android:id="@+id/view"
+                            android:layout_width="@dimen/dp_1"
+                            android:layout_height="@dimen/dp_35"
+                            android:layout_marginTop="@dimen/dp_25"
+                            android:background="@color/white30"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_total" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_recharge_text"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_18"
+                            android:text="Recharge"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_12"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_total" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_recharge"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_10"
+                            android:layout_marginTop="@dimen/dp_5"
+                            android:layout_marginBottom="@dimen/dp_5"
+                            android:text="0"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_18"
+                            android:textStyle="bold"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_recharge_text" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_donate_text"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_45"
+                            android:layout_marginTop="@dimen/dp_18"
+                            android:text="Donate"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_12"
+                            app:layout_constraintStart_toEndOf="@+id/view"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_total" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_donate"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_45"
+                            android:layout_marginTop="@dimen/dp_5"
+                            android:layout_marginBottom="@dimen/dp_5"
+                            android:singleLine="true"
+                            android:text="0"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_18"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@+id/view"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_donate_text" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.cardview.widget.CardView
+                        android:id="@+id/cardView"
+                        android:layout_width="@dimen/dp_44"
+                        android:layout_height="@dimen/dp_44"
+                        android:layout_marginEnd="@dimen/dp_25"
+                        app:cardCornerRadius="@dimen/dp_22"
+                        app:cardElevation="0dp"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_total" />
+                        app:layout_constraintTop_toTopOf="parent">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_recharge_text"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_18"
-                        android:text="Recharge"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_12"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_total" />
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/iv_avatar"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:src="@mipmap/binge_banner" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_recharge"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_5"
-                        android:layout_marginTop="@dimen/dp_5"
-                        android:layout_marginBottom="@dimen/dp_5"
-                        android:text="0"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_18"
-                        android:textStyle="bold"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_recharge_text" />
+                    </androidx.cardview.widget.CardView>
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_donate_text"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_45"
-                        android:layout_marginTop="@dimen/dp_18"
-                        android:text="Donate"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_12"
-                        app:layout_constraintStart_toEndOf="@+id/view"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_total" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_donate"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_45"
-                        android:layout_marginTop="@dimen/dp_5"
-                        android:layout_marginBottom="@dimen/dp_5"
-                        android:singleLine="true"
-                        android:text="0"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_18"
-                        android:textStyle="bold"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/view"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_donate_text" />
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/cl_tab"
+                        android:layout_width="match_parent"
+                        android:layout_height="0dp"
+                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        android:background="@drawable/e_adapter_place"
+                        android:orientation="vertical"
+                        android:paddingTop="@dimen/dp_5"
+                        android:visibility="visible"
+                        app:layout_constraintTop_toBottomOf="@+id/cl_data">
+
+                        <com.google.android.material.tabs.TabLayout
+                            android:id="@+id/tabLayout"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_115"
+                            android:background="@color/transparent"
+                            app:tabIndicatorColor="@color/transparent"
+                            app:tabIndicatorHeight="0dp"
+                            app:tabMode="fixed"
+                            app:tabRippleColor="@null" />
+
+                        <androidx.viewpager2.widget.ViewPager2
+                            android:id="@+id/viewPager"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/cardView"
-                    android:layout_width="@dimen/dp_44"
-                    android:layout_height="@dimen/dp_44"
-                    android:layout_marginEnd="@dimen/dp_25"
-                    app:cardCornerRadius="@dimen/dp_22"
-                    app:cardElevation="0dp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/iv_avatar"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:src="@mipmap/binge_banner" />
-
-                </androidx.cardview.widget.CardView>
+            </androidx.core.widget.NestedScrollView>
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
 
-                <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/cl_tab"
-                    android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_marginHorizontal="@dimen/dp_15"
-                    android:layout_marginTop="@dimen/dp_15"
-                    android:layout_marginBottom="@dimen/dp_10"
-                    android:background="@drawable/e_adapter_place"
-                    android:orientation="vertical"
-                    android:paddingTop="@dimen/dp_5"
-                    android:visibility="visible"
-                    app:layout_constraintTop_toBottomOf="@+id/cl_data">
-
-                    <com.google.android.material.tabs.TabLayout
-                        android:id="@+id/tabLayout"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_115"
-                        android:background="@color/transparent"
-                        app:tabIndicatorColor="@color/transparent"
-                        app:tabIndicatorHeight="0dp"
-                        app:tabMode="fixed"
-                        app:tabRippleColor="@null" />
-
-                    <androidx.viewpager2.widget.ViewPager2
-                        android:id="@+id/viewPager"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-        </androidx.core.widget.NestedScrollView>
-    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+    </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/ve_080b16">
@@ -31,32 +30,6 @@
         app:layout_constraintTop_toTopOf="@+id/iv_back" />
 
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_feedback_list"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/dp_15"
-        android:src="@mipmap/iv_ve_feedback"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_back"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/iv_back" />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tv_feedback_num"
-        android:layout_width="@dimen/dp_16"
-        android:layout_height="@dimen/dp_16"
-        android:layout_marginTop="@dimen/dp_6"
-        android:layout_marginEnd="@dimen/dp_8"
-        android:background="@drawable/bg_feedback_mes_num"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_12"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/iv_feedback_list"
-        app:layout_constraintTop_toTopOf="@+id/iv_feedback_list"
-        tools:text="1" />
-
-
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"

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

@@ -21,78 +21,99 @@
         android:layout_alignTop="@+id/iv_back"
         android:layout_alignBottom="@+id/iv_back"
         android:layout_centerHorizontal="true"
+        android:gravity="center"
         android:singleLine="true"
         android:text="Store"
-        android:gravity="center"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_16" />
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_restore"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/iv_back"
+        android:layout_alignBottom="@+id/iv_back"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/dp_15"
+        android:gravity="center"
+        android:singleLine="true"
+        android:text="Restore"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_14" />
 
-    <androidx.core.widget.NestedScrollView
+    <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+        android:id="@+id/stateLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/iv_back">
 
-        <androidx.appcompat.widget.LinearLayoutCompat
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="match_parent">
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_vip"
+            <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:layout_height="match_parent"
+                android:orientation="vertical">
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_coin_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_15"
-                android:layout_marginTop="@dimen/dp_10"
-                android:text="Top Up | Indefinitely use"
-                android:textColor="@color/white"
-                android:textSize="@dimen/sp_13"
-                app:layout_constraintBottom_toTopOf="@+id/recycler_coin_big"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/recycler_vip" />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_vip"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_coin_big"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_10"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/tv_coin_title" />
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_coin_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:text="Top Up | Indefinitely use"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/sp_13"
+                    app:layout_constraintBottom_toTopOf="@+id/recycler_coin_big"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/recycler_vip" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recycler_coin"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_10"
-                android:layout_marginTop="@dimen/dp_10"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/recycler_coin_big" />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_coin_big"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_coin_title" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/tv_tips"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="@dimen/dp_15"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginBottom="@dimen/dp_15"
-                android:lineSpacingExtra="@dimen/dp_2"
-                android:text="@string/ve_store_tips"
-                android:textColor="@color/white50"
-                android:textSize="@dimen/sp_12"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/recycler_coin" />
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/recycler_coin"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/recycler_coin_big" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tv_tips"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginBottom="@dimen/dp_15"
+                    android:lineSpacingExtra="@dimen/dp_2"
+                    android:text="@string/ve_store_tips"
+                    android:textColor="@color/white50"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/recycler_coin" />
 
 
-        </androidx.appcompat.widget.LinearLayoutCompat>
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
-    </androidx.core.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
+
+    </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
 
 </RelativeLayout>

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

@@ -33,15 +33,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             android:layout_marginStart="@dimen/dp_10"
-            android:layout_marginTop="@dimen/dp_25"
+            android:layout_marginTop="@dimen/dp_30"
             />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginStart="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_36"
             android:layout_marginEnd="@dimen/dp_115"
             android:fontFamily="sans-serif-medium"
             android:lineSpacingExtra="@dimen/dp_2"
@@ -58,8 +58,8 @@
             android:id="@+id/tv_content"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/dp_20"
-            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginHorizontal="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_25"
             android:minLines="4"
             android:text="when you sign out, your watch history will not be synced to your account."
             android:textColor="@color/avatarAdvert"

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

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@mipmap/playfair_selected_gradle">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/ppi_auto_renderers"
+        app:layout_constraintBottom_toBottomOf="@+id/cl_one"
+        app:layout_constraintEnd_toEndOf="@+id/cl_one"
+        app:layout_constraintStart_toStartOf="@+id/cl_one"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/checkbox_layout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_30"
+            android:src="@mipmap/iv_dialog_text_top"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_36"
+            android:layout_marginEnd="@dimen/dp_115"
+            android:fontFamily="sans-serif-medium"
+            android:lineSpacingExtra="@dimen/dp_2"
+            android:minLines="2"
+            android:text="Turn on Notifications?"
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_20"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_30"
+            android:minLines="4"
+            android:text="Get alerts for new episodes and exclusive offers."
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_go"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginHorizontal="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:background="@drawable/mc_player"
+            android:gravity="center"
+            android:text="Allow"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_content" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-45dp"
+        android:src="@mipmap/menu_unit"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_image_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_15"
+        android:src="@mipmap/iv_notifications_check"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_image" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:padding="@dimen/dp_10"
+        android:src="@mipmap/factory_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_one" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@color/window_bg_color">
+
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="@dimen/dp_80"
+        android:orientation="horizontal">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_quality_480"
+                android:layout_width="@dimen/dp_100"
+                android:layout_height="@dimen/dp_54"
+                android:background="@mipmap/iv_quality_bg_on"
+                android:gravity="center"
+                android:text="480p"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <com.hjq.shape.view.ShapeTextView
+                android:id="@+id/tv_quality_720"
+                android:layout_width="@dimen/dp_100"
+                android:layout_height="@dimen/dp_54"
+                android:background="@mipmap/iv_quality_bg_off"
+                android:gravity="center"
+                android:text="720p"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_login_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_14"
+                android:background="@drawable/bg_quality_login"
+                android:drawableStart="@mipmap/iv_quality_login_user"
+                android:drawablePadding="@dimen/dp_2"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/dp_5"
+                android:text="Login"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_8"
+                app:layout_constraintEnd_toEndOf="@+id/tv_quality_720"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <com.hjq.shape.view.ShapeTextView
+                android:id="@+id/tv_quality_1080"
+                android:layout_width="@dimen/dp_100"
+                android:layout_height="@dimen/dp_54"
+                android:background="@mipmap/iv_quality_bg_off"
+                android:gravity="center"
+                android:text="1080p"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_vip_tag"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_14"
+                android:background="@drawable/bg_quality_vip"
+                android:drawableStart="@mipmap/iv_quality_login_vip"
+                android:drawablePadding="@dimen/dp_2"
+                android:gravity="center"
+                android:paddingHorizontal="@dimen/dp_5"
+                android:text="VIP"
+                android:textColor="#CF8E02"
+                android:textSize="@dimen/sp_8"
+                app:layout_constraintEnd_toEndOf="@+id/tv_quality_1080"
+                app:layout_constraintTop_toTopOf="parent" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+</FrameLayout>

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

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@mipmap/playfair_selected_gradle">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/ppi_auto_renderers"
+        app:layout_constraintBottom_toBottomOf="@+id/cl_one"
+        app:layout_constraintEnd_toEndOf="@+id/cl_one"
+        app:layout_constraintStart_toStartOf="@+id/cl_one"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/checkbox_layout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_30"
+            android:src="@mipmap/iv_dialog_text_top"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_36"
+            android:layout_marginEnd="@dimen/dp_135"
+            android:fontFamily="sans-serif-medium"
+            android:lineSpacingExtra="@dimen/dp_2"
+            android:maxLines="2"
+            android:ellipsize="end"
+            android:text="Discover a new version"
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_20"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_23"
+            android:layout_marginTop="@dimen/sp_12"
+            android:background="@drawable/bg_upload_version"
+            android:paddingHorizontal="@dimen/sp_8"
+            android:paddingVertical="@dimen/dp_3"
+            android:text="v2.0"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_12"
+            android:minLines="4"
+            android:text="when you sign out, your watch history will not be synced to your account."
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintBottom_toTopOf="@+id/tv_now"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_version" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_now"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginHorizontal="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_15"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:background="@drawable/mc_player"
+            android:gravity="center"
+            android:text="Update Now"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_content" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-45dp"
+        android:src="@mipmap/iv_version_control_top"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:padding="@dimen/dp_10"
+        android:src="@mipmap/factory_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_one" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:background="@mipmap/playfair_selected_gradle">
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/ppi_auto_renderers"
+        app:layout_constraintBottom_toBottomOf="@+id/cl_one"
+        app:layout_constraintEnd_toEndOf="@+id/cl_one"
+        app:layout_constraintStart_toStartOf="@+id/cl_one"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@mipmap/checkbox_layout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_30"
+            android:src="@mipmap/iv_dialog_text_top"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_36"
+            android:layout_marginEnd="@dimen/dp_115"
+            android:fontFamily="sans-serif-medium"
+            android:lineSpacingExtra="@dimen/dp_2"
+            android:minLines="2"
+            android:text="Unlock HD VIP Access!"
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_20"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_content"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_23"
+            android:layout_marginTop="@dimen/dp_25"
+            android:minLines="4"
+            android:text="Activate vip and enjoy HD video privileges."
+            android:textColor="@color/avatarAdvert"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
+
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_cancel"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginStart="@dimen/dp_30"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_5"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:background="@drawable/bg_login"
+            android:gravity="center"
+            android:text="Later"
+            android:textColor="#B3B3B3"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_go"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_content" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_go"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/dp_48"
+            android:layout_marginStart="@dimen/dp_5"
+            android:layout_marginTop="@dimen/dp_20"
+            android:layout_marginEnd="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_30"
+            android:background="@drawable/mc_player"
+            android:gravity="center"
+            android:text="Go"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tv_cancel"
+            app:layout_constraintTop_toBottomOf="@id/tv_content" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-45dp"
+        android:src="@mipmap/iv_dialog_vip_activate_top"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cl_one" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:padding="@dimen/dp_10"
+        android:src="@mipmap/factory_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_one" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+
+
+    <View
+        android:id="@+id/v_bg"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/iv_top"
+        android:layout_alignBottom="@+id/v_line"
+        android:layout_marginTop="@dimen/dp_75"
+        android:background="@mipmap/iv_dialog_vip_splash_bg" />
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp_15"
+        android:background="@mipmap/iv_dialog_vip_splash_top" />
+
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/iv_top"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_30"
+        android:fontFamily="sans-serif-medium"
+        android:lineSpacingExtra="@dimen/dp_2"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:text="Unlock VIP Privileges!"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_16" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_title"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_15"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:minLines="2"
+        android:text="Enjoy ad-free streaming, early access, and exclusive content!"
+        android:textColor="#C5C5C5"
+        android:textSize="@dimen/sp_14" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="@dimen/dp_240"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginHorizontal="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_15"
+        />
+
+    <View
+        android:id="@+id/v_line"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_15"
+        android:layout_below="@+id/recyclerView"
+        />
+
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/v_line"
+        android:layout_centerHorizontal="true"
+        android:padding="@dimen/dp_10"
+        android:src="@mipmap/factory_icon" />
+
+</RelativeLayout>

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

@@ -261,6 +261,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
+                    android:ellipsize="end"
+                    android:maxWidth="@dimen/dp_60"
+                    android:maxLines="2"
                     android:text="Donate"
                     android:textColor="@color/gradleLayout"
                     android:textSize="@dimen/sp_14"
@@ -318,7 +321,7 @@
                     android:id="@+id/tv_store"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="@dimen/dp_30"
+                    android:layout_marginHorizontal="@dimen/dp_20"
                     android:drawableTop="@mipmap/empty_image"
                     android:gravity="center"
                     android:text="Store"
@@ -332,12 +335,12 @@
                     android:id="@+id/tv_rewards"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/dp_20"
                     android:drawableTop="@mipmap/bold_wight_fddebcdbeeffcebdf"
                     android:gravity="center"
                     android:text="Rewards"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
-                    android:visibility="gone"
                     app:layout_constraintEnd_toStartOf="@+id/tv_favorites"
                     app:layout_constraintStart_toEndOf="@+id/tv_store"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -392,10 +395,10 @@
                     android:drawablePadding="@dimen/dp_8"
                     android:gravity="center_vertical"
                     android:paddingHorizontal="@dimen/dp_10"
-                    android:visibility="gone"
                     android:text="@string/dimensImage"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/sp_14"
+                    android:visibility="visible" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/tv_delete_account"

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

@@ -14,13 +14,13 @@
         android:src="@mipmap/right_dimens"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-<ScrollView
-android:orientation="vertical"
-android:layout_height="0dp"
-android:visibility="invisible"
-android:layout_width="0dp"
-android:background="#58AE3A">
-</ScrollView>
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#58AE3A"
+        android:orientation="vertical"
+        android:visibility="invisible"></ScrollView>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_title"
@@ -33,23 +33,32 @@ android:background="#58AE3A">
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/iv_back" />
-<LinearLayout
-android:layout_height="210dp"
-android:padding="53dp"
-android:visibility="gone"
-android:background="#1AB1B1"
-android:layout_width="wrap_content"
-android:orientation="vertical">
-</LinearLayout>
 
-    <WebView
-        android:id="@+id/webView"
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="210dp"
+        android:background="#1AB1B1"
+        android:orientation="vertical"
+        android:padding="53dp"
+        android:visibility="gone"></LinearLayout>
+
+    <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+        android:id="@+id/stateLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginTop="@dimen/dp_5"
-        android:background="@color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_back" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_back">
 
+        <WebView
+            android:id="@+id/webView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/dp_5"
+            android:background="@color/transparent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_back" />
+
+    </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -14,14 +14,23 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/ic_icon_banner"
+        <FrameLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:layout_height="match_parent">
+
+            <com.veloria.now.shortapp.rewards.BannerPlayerView
+                android:id="@+id/banner_player"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/ic_icon_banner"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop" />
+
+        </FrameLayout>
+
     </androidx.cardview.widget.CardView>
 
     <androidx.appcompat.widget.AppCompatTextView

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

@@ -14,7 +14,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="@dimen/dp_14"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_18"
         android:gravity="center_horizontal"
         android:text="Weekly VIP"
         android:textColor="#647DA7"

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

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_55"
+    android:layout_marginBottom="@dimen/dp_10"
+    android:background="@mipmap/iv_dialog_vip_splash_vip_1">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_16"
+        android:text="0"
+        android:textColor="#416767"
+        android:textSize="@dimen/sp_22"
+        android:textStyle="bold" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_money_day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_8"
+        android:layout_toEndOf="@+id/tv_money"
+        android:text="/month"
+        android:textColor="#416767"
+        android:textSize="@dimen/sp_12" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_extra"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/tv_money"
+        android:layout_marginStart="@dimen/dp_16"
+        android:drawableEnd="@mipmap/iv_coins_small"
+        android:paddingVertical="@dimen/dp_3"
+        android:paddingHorizontal="@dimen/dp_6"
+        android:background="@drawable/bg_store_vip_text_1"
+        android:drawablePadding="@dimen/dp_5"
+        android:text="+Extra 0"
+        android:textColor="#416767"
+        android:textSize="@dimen/sp_10" />
+
+    <ImageView
+        android:id="@+id/tv_hot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginTop="@dimen/dp_4"
+        android:visibility="gone"
+        android:layout_marginEnd="@dimen/dp_4"
+        android:background="@mipmap/iv_store_vip_big_hot" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/tv_select"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/bg_coin_left"
+        android:gravity="center"
+        android:paddingHorizontal="@dimen/dp_5"
+        android:src="@mipmap/iv_yes"
+        android:visibility="invisible" />
+
+
+</RelativeLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.veloria.now.shortapp.rewards.VSNotificationsDefault xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/stateLayout"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/playfair_selected_gradle">
@@ -9,12 +8,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.viewpager2.widget.ViewPager2
-            android:id="@+id/viewPager_detail"
+        <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+            android:id="@+id/stateLayout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" />
+            android:layout_height="match_parent">
 
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/viewPager_detail"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical" />
+        </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/iv_cover"
@@ -25,16 +29,24 @@
 
         <include
             android:id="@+id/layout_lock"
-            layout="@layout/layout_ve_lock_episode"
-            />
+            layout="@layout/layout_ve_lock_episode" />
 
         <include
             android:id="@+id/layout_recommend"
-            layout="@layout/layout_player_recommend"
-            />
+            layout="@layout/layout_player_recommend" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_back"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_35"
+        android:padding="@dimen/dp_15"
+        android:src="@mipmap/right_dimens"
+        android:visibility="gone"
+        />
 
-</com.veloria.now.shortapp.rewards.VSNotificationsDefault>
+
+</FrameLayout>

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

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.media3.ui.PlayerView
+        android:id="@+id/player_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:controller_layout_id="@layout/layout_player_recommend_controller"
+        app:resize_mode="zoom" />
+</FrameLayout>

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

@@ -38,39 +38,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.cardview.widget.CardView
-            android:id="@+id/cardView"
-            android:layout_width="@dimen/dp_190"
-            android:layout_height="@dimen/dp_260"
-            android:layout_marginTop="@dimen/dp_19"
-            android:background="@color/transparent"
-            app:cardCornerRadius="@dimen/dp_8"
-            app:cardElevation="0dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_title">
-
-
-            <androidx.media3.ui.PlayerView
-                android:id="@+id/recommend_player_view"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:controller_layout_id="@layout/layout_player_recommend_controller"
-                app:resize_mode="zoom" />
-
-
-        </androidx.cardview.widget.CardView>
-
-
-        <com.youth.banner.Banner
+        <com.zhpan.bannerview.BannerViewPager
             android:id="@+id/banner_recommend"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_340"
             android:layout_marginTop="@dimen/dp_19"
             android:layout_marginHorizontal="@dimen/dp_23"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            app:banner_auto_loop="false"
+            app:bvp_round_corner="@dimen/dp_13"
+            app:bvp_auto_play="false"
+            app:bvp_can_loop="false"
+            app:bvp_indicator_radius="0dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_title" />
 

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

@@ -39,11 +39,42 @@
         android:gravity="center_vertical"
         android:text=""
         android:textColor="#05CEA0"
-        app:drawableEndCompat="@mipmap/start_text"
         app:layout_constraintBottom_toBottomOf="@+id/tv_coins_text"
         app:layout_constraintStart_toEndOf="@+id/tv_coins_text"
         app:layout_constraintTop_toTopOf="@+id/tv_coins_text" />
 
+
+    <androidx.appcompat.widget.LinearLayoutCompat
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_26"
+        android:layout_marginStart="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_17"
+        android:layout_toRightOf="@+id/tv_coins"
+        android:background="@drawable/jru_categories_constants"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingHorizontal="@dimen/dp_12">
+
+        <TextView
+            android:id="@+id/tv_unlock_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Unlock: "
+            android:textColor="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_unlock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableEnd="@mipmap/iv_coins_small"
+            android:drawablePadding="@dimen/dp_3"
+            android:gravity="center"
+            android:text="0"
+            android:textColor="#05CEA0" />
+
+
+    </androidx.appcompat.widget.LinearLayoutCompat>
+
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -1,415 +1,416 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.veloria.now.shortapp.rewards.VSNotificationsDefault xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:id="@+id/stateLayout"
     android:background="@mipmap/playfair_selected_gradle">
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/text_home"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_root"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="@dimen/dp_20"
-        android:layout_marginEnd="8dp"
-        android:text="@string/home_addictive_shorts_await"
-        android:textAlignment="center"
-        android:textColor="@color/white"
-        android:textSize="@dimen/sp_15"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent">
 
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_time"
-        android:layout_width="@dimen/dp_40"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginTop="@dimen/dp_12"
-        android:layout_marginEnd="@dimen/dp_15"
-        android:src="@mipmap/lock_round"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_home" />
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/text_home"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="@dimen/dp_60"
+            android:layout_marginEnd="8dp"
+            android:text="@string/home_addictive_shorts_await"
+            android:textAlignment="center"
+            android:textColor="@color/white"
+            android:textSize="@dimen/sp_15"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.LinearLayoutCompat
-        android:id="@+id/fl_search"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dp_40"
-        android:layout_marginStart="@dimen/dp_15"
-        android:layout_marginEnd="@dimen/dp_10"
-        android:background="@drawable/uta_android_news"
-        android:gravity="center_vertical"
-        app:layout_constraintEnd_toStartOf="@+id/iv_time"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/iv_time">
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/dp_5"
-            android:src="@mipmap/splash_backup" />
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="#CBB7AB"
-            android:orientation="horizontal"
-            android:paddingLeft="35dp"
-            android:visibility="gone"></LinearLayout>
-
-        <com.veloria.now.shortapp.rewards.ESplashStandView
-            android:id="@+id/tv_search"
-            android:layout_width="match_parent"
+            android:id="@+id/iv_time"
+            android:layout_width="@dimen/dp_40"
             android:layout_height="@dimen/dp_40"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:text="@string/search_dramas"
-            android:textColor="#9d9d9d" />
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginEnd="@dimen/dp_15"
+            android:src="@mipmap/lock_round"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_home" />
 
-        <TextView
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:id="@+id/fl_search"
             android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="#1BC0AB"
-            android:padding="36dp"
-            android:textColor="#2B74CE"
-            android:visibility="gone" />
-    </androidx.appcompat.widget.LinearLayoutCompat>
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginStart="@dimen/dp_15"
+            android:layout_marginEnd="@dimen/dp_10"
+            android:background="@drawable/uta_android_news"
+            android:gravity="center_vertical"
+            app:layout_constraintEnd_toStartOf="@+id/iv_time"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_time">
 
-    <com.scwang.smart.refresh.layout.SmartRefreshLayout
-        android:id="@+id/refresh"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginTop="@dimen/dp_10"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fl_search">
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_5"
+                android:src="@mipmap/splash_backup" />
 
-        <com.veloria.now.shortapp.rewards.VSNotificationsDefault
-            android:id="@+id/stateLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="#CBB7AB"
+                android:orientation="horizontal"
+                android:paddingLeft="35dp"
+                android:visibility="gone"></LinearLayout>
 
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/scrollView"
+            <com.veloria.now.shortapp.rewards.ESplashStandView
+                android:id="@+id/tv_search"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="@dimen/dp_40"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="@string/search_dramas"
+                android:textColor="#9d9d9d" />
 
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/constraint"
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="#1BC0AB"
+                android:padding="36dp"
+                android:textColor="#2B74CE"
+                android:visibility="gone" />
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
+        <com.scwang.smart.refresh.layout.SmartRefreshLayout
+            android:id="@+id/refresh"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/dp_10"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/fl_search">
+
+                <androidx.core.widget.NestedScrollView
+                    android:id="@+id/scrollView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
-                    <com.youth.banner.Banner
-                        android:id="@+id/banner"
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_182"
-                        android:layout_marginHorizontal="@dimen/dp_15"
-                        android:visibility="gone"
-                        app:banner_auto_loop="true"
-                        app:banner_indicator_gravity="right"
-                        app:banner_indicator_marginBottom="@dimen/dp_10"
-                        app:banner_indicator_marginRight="@dimen/dp_10"
-                        app:banner_indicator_normal_color="@color/white35"
-                        app:banner_indicator_normal_width="@dimen/dp_5"
-                        app:banner_indicator_radius="@dimen/dp_4"
-                        app:banner_indicator_selected_color="#7C174F"
-                        app:banner_indicator_selected_width="@dimen/dp_7"
-                        app:banner_indicator_space="@dimen/dp_5"
-                        app:banner_radius="@dimen/dp_10"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:background="@color/white" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_menu_binge"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_30"
-                        android:drawableStart="@mipmap/icon_base"
-                        android:drawablePadding="@dimen/dp_5"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/binge_worthy_picks"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_14"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/banner" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_more_binge"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawableEnd="@mipmap/privacy_stop"
-                        android:paddingHorizontal="@dimen/dp_15"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="More"
-                        android:textColor="@color/white80"
-                        android:textSize="@dimen/sp_12"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_menu_binge"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_menu_binge" />
-
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_binge"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_menu_binge" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_menu_just"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_30"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/just_dropped"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_14"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/recycler_binge" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_more_just"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawableEnd="@mipmap/privacy_stop"
-                        android:paddingHorizontal="@dimen/dp_15"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="More"
-                        android:textColor="@color/white80"
-                        android:textSize="@dimen/sp_12"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_menu_just"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_menu_just" />
-
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_just"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_menu_just" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_menu_drama"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_30"
-                        android:drawableStart="@mipmap/ball_colors_auto_ho"
-                        android:drawablePadding="@dimen/dp_5"
-                        android:fontFamily="sans-serif-medium"
-                        android:gravity="center_vertical"
-                        android:text="@string/drama_champions"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_14"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/recycler_just" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_more_drama"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawableEnd="@mipmap/privacy_stop"
-                        android:paddingHorizontal="@dimen/dp_15"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="More"
-                        android:textColor="@color/white80"
-                        android:textSize="@dimen/sp_12"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_menu_drama"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_menu_drama" />
-
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_drama"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_menu_drama" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_menu_free"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_30"
-                        android:fontFamily="sans-serif-medium"
-                        android:text="@string/free_gems"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/sp_14"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/recycler_drama" />
-
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/tv_more_free"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:drawableEnd="@mipmap/privacy_stop"
-                        android:paddingHorizontal="@dimen/dp_15"
-                        android:paddingVertical="@dimen/dp_5"
-                        android:text="More"
-                        android:textColor="@color/white80"
-                        android:textSize="@dimen/sp_12"
-                        android:visibility="gone"
-                        app:layout_constraintBottom_toBottomOf="@+id/tv_menu_free"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tv_menu_free" />
-
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/recycler_free"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/dp_15"
-                        android:layout_marginTop="@dimen/dp_10"
-                        android:visibility="gone"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_menu_free" />
-
-
                     <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/cl_categories_tab"
+                        android:id="@+id/constraint"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/dp_90"
-                        android:layout_marginTop="@dimen/dp_12"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/recycler_free">
+                        android:layout_height="match_parent">
 
-                        <androidx.appcompat.widget.AppCompatImageView
+                        <com.youth.banner.Banner
+                            android:id="@+id/banner"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:scaleType="centerCrop"
-                            android:src="@mipmap/details_lock_list"
+                            android:layout_height="@dimen/dp_182"
+                            android:layout_marginHorizontal="@dimen/dp_15"
+                            android:visibility="gone"
+                            app:banner_auto_loop="true"
+                            app:banner_indicator_gravity="right"
+                            app:banner_indicator_marginBottom="@dimen/dp_10"
+                            app:banner_indicator_marginRight="@dimen/dp_10"
+                            app:banner_indicator_normal_color="@color/white35"
+                            app:banner_indicator_normal_width="@dimen/dp_5"
+                            app:banner_indicator_radius="@dimen/dp_4"
+                            app:banner_indicator_selected_color="#7C174F"
+                            app:banner_indicator_selected_width="@dimen/dp_7"
+                            app:banner_indicator_space="@dimen/dp_5"
+                            app:banner_radius="@dimen/dp_10"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:background="@color/white" />
+
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/tv_menu_categories"
+                            android:id="@+id/tv_menu_binge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_30"
+                            android:drawableStart="@mipmap/icon_base"
+                            android:drawablePadding="@dimen/dp_5"
                             android:fontFamily="sans-serif-medium"
-                            android:paddingTop="@dimen/dp_10"
-                            android:text="@string/select_categories"
+                            android:text="@string/binge_worthy_picks"
                             android:textColor="@color/white"
                             android:textSize="@dimen/sp_14"
+                            android:visibility="gone"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            app:layout_constraintTop_toBottomOf="@+id/banner" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_more_binge"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@mipmap/privacy_stop"
+                            android:paddingHorizontal="@dimen/dp_15"
+                            android:paddingVertical="@dimen/dp_5"
+                            android:text="More"
+                            android:textColor="@color/white80"
+                            android:textSize="@dimen/sp_12"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/tv_menu_binge"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/tv_menu_binge" />
+
 
                         <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/recycler_categories_tab"
-                            android:layout_width="match_parent"
-                            android:layout_height="@dimen/dp_45"
-                            android:layout_marginStart="@dimen/dp_15"
-                            android:layout_marginTop="@dimen/dp_10"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tv_menu_categories" />
-
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="#1805E2"
-                        android:orientation="vertical"
-                        android:paddingBottom="4dp"
-                        android:visibility="gone"></LinearLayout>
-
-                    <com.veloria.now.shortapp.rewards.VSNotificationsDefault
-                        android:id="@+id/state_categories"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/cl_categories_tab">
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/recycler_categories"
+                            android:id="@+id/recycler_binge"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="@dimen/dp_10"
-                            android:layout_marginVertical="@dimen/dp_10" />
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_menu_binge" />
 
-                        <ScrollView
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_menu_just"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_30"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/just_dropped"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/recycler_binge" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_more_just"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@mipmap/privacy_stop"
+                            android:paddingHorizontal="@dimen/dp_15"
+                            android:paddingVertical="@dimen/dp_5"
+                            android:text="More"
+                            android:textColor="@color/white80"
+                            android:textSize="@dimen/sp_12"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/tv_menu_just"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/tv_menu_just" />
+
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_just"
                             android:layout_width="match_parent"
-                            android:layout_height="249dp"
-                            android:background="#C8993B"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_menu_just" />
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_menu_drama"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_30"
+                            android:drawableStart="@mipmap/ball_colors_auto_ho"
+                            android:drawablePadding="@dimen/dp_5"
+                            android:fontFamily="sans-serif-medium"
+                            android:gravity="center_vertical"
+                            android:text="@string/drama_champions"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/recycler_just" />
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_more_drama"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@mipmap/privacy_stop"
+                            android:paddingHorizontal="@dimen/dp_15"
+                            android:paddingVertical="@dimen/dp_5"
+                            android:text="More"
+                            android:textColor="@color/white80"
+                            android:textSize="@dimen/sp_12"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/tv_menu_drama"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/tv_menu_drama" />
+
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_drama"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_menu_drama" />
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_menu_free"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_30"
+                            android:fontFamily="sans-serif-medium"
+                            android:text="@string/free_gems"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/sp_14"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/recycler_drama" />
+
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tv_more_free"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:drawableEnd="@mipmap/privacy_stop"
+                            android:paddingHorizontal="@dimen/dp_15"
+                            android:paddingVertical="@dimen/dp_5"
+                            android:text="More"
+                            android:textColor="@color/white80"
+                            android:textSize="@dimen/sp_12"
+                            android:visibility="gone"
+                            app:layout_constraintBottom_toBottomOf="@+id/tv_menu_free"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintTop_toTopOf="@+id/tv_menu_free" />
+
+
+                        <androidx.recyclerview.widget.RecyclerView
+                            android:id="@+id/recycler_free"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_15"
+                            android:layout_marginTop="@dimen/dp_10"
+                            android:visibility="gone"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_menu_free" />
+
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                            android:id="@+id/cl_categories_tab"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_90"
+                            android:layout_marginTop="@dimen/dp_12"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/recycler_free">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:scaleType="centerCrop"
+                                android:src="@mipmap/details_lock_list"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <androidx.appcompat.widget.AppCompatTextView
+                                android:id="@+id/tv_menu_categories"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginStart="@dimen/dp_15"
+                                android:fontFamily="sans-serif-medium"
+                                android:paddingTop="@dimen/dp_10"
+                                android:text="@string/select_categories"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/sp_14"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
+
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/recycler_categories_tab"
+                                android:layout_width="match_parent"
+                                android:layout_height="@dimen/dp_45"
+                                android:layout_marginStart="@dimen/dp_15"
+                                android:layout_marginTop="@dimen/dp_10"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/tv_menu_categories" />
+
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:background="#1805E2"
                             android:orientation="vertical"
-                            android:padding="22dp"
-                            android:visibility="gone"></ScrollView>
+                            android:paddingBottom="4dp"
+                            android:visibility="gone"></LinearLayout>
 
-                    </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.core.widget.NestedScrollView>
-        </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
-    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+                        <com.veloria.now.shortapp.rewards.VSNotificationsDefault
+                            android:id="@+id/state_categories"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toBottomOf="@+id/cl_categories_tab">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/cl_categories_tab_1"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_90"
-        android:layout_marginTop="@dimen/dp_10"
-        android:background="#0C0C0E"
-        android:visibility="gone"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/fl_search">
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/recycler_categories"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginHorizontal="@dimen/dp_10"
+                                android:layout_marginVertical="@dimen/dp_10" />
 
-        <androidx.appcompat.widget.AppCompatImageView
+                            <ScrollView
+                                android:layout_width="match_parent"
+                                android:layout_height="249dp"
+                                android:background="#C8993B"
+                                android:orientation="vertical"
+                                android:padding="22dp"
+                                android:visibility="gone"></ScrollView>
+
+                        </com.veloria.now.shortapp.rewards.VSNotificationsDefault>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.core.widget.NestedScrollView>
+        </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_categories_tab_1"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/details_lock_list_1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_menu_categories_1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/dp_15"
-            android:fontFamily="sans-serif-medium"
-            android:paddingTop="@dimen/dp_10"
-            android:text="@string/select_categories"
-            android:textColor="@color/white"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_categories_tab_1"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_45"
-            android:layout_marginStart="@dimen/dp_15"
+            android:layout_height="@dimen/dp_90"
             android:layout_marginTop="@dimen/dp_10"
+            android:background="#0C0C0E"
+            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_menu_categories_1" />
+            app:layout_constraintTop_toBottomOf="@+id/fl_search">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                android:src="@mipmap/details_lock_list_1"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_menu_categories_1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/dp_15"
+                android:fontFamily="sans-serif-medium"
+                android:paddingTop="@dimen/dp_10"
+                android:text="@string/select_categories"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recycler_categories_tab_1"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_45"
+                android:layout_marginStart="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_10"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_menu_categories_1" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</com.veloria.now.shortapp.rewards.VSNotificationsDefault>

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

@@ -46,6 +46,8 @@ android:orientation="vertical">
         android:layout_height="wrap_content"
         android:layout_below="@+id/tvEmptyTitle"
         android:layout_centerHorizontal="true"
+        android:layout_marginHorizontal="@dimen/dp_15"
+        android:gravity="center"
         android:layout_marginBottom="@dimen/dp_30"
         android:text="Start exploring and add something!"
         android:textColor="@color/white"

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

@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
-<ScrollView
-android:layout_width="0dp"
-android:layout_height="0dp"
-android:visibility="invisible"
-android:orientation="horizontal"
-android:background="#999C19"
-android:paddingLeft="57dp">
-</ScrollView>
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#999C19"
+        android:orientation="horizontal"
+        android:paddingLeft="57dp"
+        android:visibility="invisible"></ScrollView>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/iv_back_controller"
@@ -27,21 +27,22 @@ android:paddingLeft="57dp">
         android:layout_marginTop="@dimen/dp_40"
         android:padding="@dimen/dp_10"
         android:src="@mipmap/right_dimens" />
-<ScrollView
-android:layout_height="0dp"
-android:orientation="horizontal"
-android:paddingLeft="80dp"
-android:layout_width="0dp"
-android:background="#1C03E5">
-<LinearLayout
-android:paddingBottom="37dp"
-android:layout_width="0dp"
-android:layout_height="0dp"
-android:background="#D3A2CF"
-    android:visibility="invisible"
-android:orientation="horizontal">
-</LinearLayout>
-</ScrollView>
+
+    <ScrollView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#1C03E5"
+        android:orientation="horizontal"
+        android:paddingLeft="80dp">
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="#D3A2CF"
+            android:orientation="horizontal"
+            android:paddingBottom="37dp"
+            android:visibility="invisible"></LinearLayout>
+    </ScrollView>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_player_title"
@@ -56,21 +57,23 @@ android:orientation="horizontal">
         android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_16" />
-<EditText
-android:text="enumeratedRtmpdh"
-android:background="#094A0F"
-android:layout_width="0dp"
-android:layout_height="0dp"
-android:paddingBottom="91dp"
-android:visibility="visible"
-android:hint="knockoutCovariance"
-android:textSize="17sp"/>
+
+    <EditText
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="#094A0F"
+        android:hint="knockoutCovariance"
+        android:paddingBottom="91dp"
+        android:text="enumeratedRtmpdh"
+        android:textSize="17sp"
+        android:visibility="visible" />
 
 
     <LinearLayout
         android:id="@+id/ll_episode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_toLeftOf="@+id/tv_quality"
         android:layout_alignParentBottom="true"
         android:layout_marginHorizontal="@dimen/dp_15"
         android:layout_marginBottom="@dimen/dp_15"
@@ -89,13 +92,13 @@ android:textSize="17sp"/>
             android:paddingVertical="@dimen/dp_5"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_13" />
-<ScrollView
-android:visibility="visible"
-android:layout_height="0dp"
-android:paddingLeft="95dp"
-android:layout_width="0dp"
-android:orientation="vertical">
-</ScrollView>
+
+        <ScrollView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:orientation="vertical"
+            android:paddingLeft="95dp"
+            android:visibility="visible"></ScrollView>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_episode_player_all"
@@ -110,14 +113,29 @@ android:orientation="vertical">
             android:text="All 58 Episodes"
             android:textColor="@color/utilsUtils"
             android:textSize="@dimen/sp_13" />
-<View
-android:layout_width="0dp"
-android:layout_height="0dp"
-android:visibility="visible"
-android:paddingTop="6dp"/>
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:paddingTop="6dp"
+            android:visibility="visible" />
 
     </LinearLayout>
 
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_quality"
+        android:layout_width="@dimen/dp_65"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/ll_episode"
+        android:layout_alignBottom="@+id/ll_episode"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/dp_15"
+        android:text="540P"
+        android:textColor="@color/white"
+        android:gravity="center"
+        android:background="@drawable/t_lock"
+        />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/tv_player_seek_time"
         android:layout_width="wrap_content"
@@ -130,21 +148,22 @@ android:paddingTop="6dp"/>
         android:textSize="@dimen/sp_12"
         android:visibility="invisible"
         tools:text="00:00/02:24" />
-<ScrollView
-android:paddingBottom="53dp"
-android:background="#AF907C"
-android:layout_width="127dp"
-android:visibility="gone"
-android:orientation="horizontal"
-android:layout_height="7dp">
-<LinearLayout
-android:paddingLeft="37dp"
-android:layout_height="wrap_content"
-android:orientation="vertical"
-android:layout_width="match_parent"
-android:visibility="gone">
-</LinearLayout>
-</ScrollView>
+
+    <ScrollView
+        android:layout_width="127dp"
+        android:layout_height="7dp"
+        android:background="#AF907C"
+        android:orientation="horizontal"
+        android:paddingBottom="53dp"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingLeft="37dp"
+            android:visibility="gone"></LinearLayout>
+    </ScrollView>
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/ll_bottom_controller"