diff --git a/app/build.gradle b/app/build.gradle index 71b5385..d347aff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,15 +3,15 @@ plugins { } android { - namespace 'com.jelly.zyreotv.app' + namespace 'com.shortdrama.jelly.zyreotv' compileSdk 35 defaultConfig { - applicationId "com.jelly.zyreotv.app" + applicationId "com.shortdrama.jelly.zyreotv" minSdk 24 targetSdk 35 versionCode 1 - versionName "1.0" + versionName "1.0.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true @@ -33,14 +33,16 @@ android { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.signs + debuggable false } debug { - signingConfig signingConfigs.signs - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.signs + debuggable true + } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f3df6b4..67faaaa 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -170,8 +170,16 @@ --dontwarn com.jelly.zyreotv.app.** --keep class com.jelly.zyreotv.app.** {*;} +-dontwarn com.shortdrama.jelly.zyreotv.model.** +-keep class com.shortdrama.jelly.zyreotv.model.** {*;} + +-dontwarn com.shortdrama.jelly.zyreotv.api.** +-keep class com.shortdrama.jelly.zyreotv.api.** {*;} + +-keepclassmembers class **.R$* { + public static ; +} +-keep class * implements androidx.viewbinding.ViewBinding{ *;} # RxJava2核心类保留 -keepclassmembers class rx.internal.util.unsafe.* { @@ -193,6 +201,27 @@ *; } +# 保留 Gson 所需的泛型签名 +-keepattributes Signature + +# 保留 TypeToken 本身 +-keep class com.google.gson.reflect.TypeToken { *; } +-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken +-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken + +# 保留你的数据实体类不被混淆（根据你的包名调整） +#-dontwarn com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.** +#-keep class com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.** { *; } +#-dontwarn com.shortdrama.jelly.zyreotv.dlsym.** +#-keep class com.shortdrama.jelly.zyreotv.dlsym.** {*;} +#-dontwarn com.shortdrama.jelly.zyreotv.beginning.** +#-keep class com.shortdrama.jelly.zyreotv.beginning.** {*;} + +# 如果使用 @SerializedName 注解，保留字段名 +-keepclassmembers class * { + @com.google.gson.annotations.SerializedName ; +} + # R8 针对 RxJava2 的优化处理（如果你使用的是 R8） -dontwarn sun.misc.** @@ -200,3 +229,335 @@ -keepattributes *Annotation* + +-keep public class * extends androidx.appcompat.app.AppCompatActivity +-keep public class * extends androidx.fragment.app.Fragment +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.preference.Preference +-keep public class * extends android.view.View +-keep class android.support.** {*;} +-keep interface android.support.** {*;} +-keep public class * extends android.support.v4.** +-keep public class * extends android.support.v7.** +-keep public class * extends android.support.annotation.** +-dontwarn android.support.** +-keep class androidx.** {*;} +-keep public class * extends androidx.** +-keep interface androidx.** {*;} +-keep class com.google.android.material.** {*;} +-dontwarn androidx.** +-dontwarn com.google.android.material.** +-dontnote com.google.android.material.** + + +-keepclasseswithmembernames class * { + native ; +} + +-keep public class * extends android.view.View{ + *** get*(); + void set*(***); + public (android.content.Context); + public (android.content.Context,android.util.AttributeSet); + public (android.content.Context,android.util.AttributeSet,int); +} +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet); + public (android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} + +-keep public class * implements java.io.Serializable {*;} +-keepclassmembers class * implements java.io.Serializable { + static final long serialVersionUID; + private static final java.io.ObjectStreamField[] serialPersistentFields; + private void writeObject(java.io.ObjectOutputStream); + private void readObject(java.io.ObjectInputStream); + java.lang.Object writeReplace(); + java.lang.Object readResolve(); +} + +-keep class **.R$* {*;} + +-keepclassmembers class * { + void *(**On*Event); + void *(**On*Listener); +} + +-keepclassmembers class * extends android.webkit.WebViewClient { + public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap); + public boolean *(android.webkit.WebView, java.lang.String); +} +-keepclassmembers class * extends android.webkit.WebViewClient { + public void *(android.webkit.WebView, java.lang.String); + } + +-keepclassmembers class * { + public (org.json.JSONObject); +} + +-keepattributes Signature + +-keepattributes InnerClasses + +-assumenosideeffects class android.util.Log { + public static *** v(...); + public static *** d(...); + public static *** i(...); + public static *** w(...); + public static *** e(...); +} + +-dontwarn kotlin.** +-keep class kotlin.** { *; } +-keep interface kotlin.** { *; } +-keepclassmembers class kotlin.Metadata { + public ; +} +-keepclasseswithmembers @kotlin.Metadata class * { *; } +-keepclassmembers class **.WhenMappings { + ; +} +-assumenosideeffects class kotlin.jvm.internal.Intrinsics { + static void checkParameterIsNotNull(java.lang.Object, java.lang.String); +} + +-keep class kotlinx.** { *; } +-keep interface kotlinx.** { *; } +-dontwarn kotlinx.** +-keep class org.jetbrains.** { *; } +-keep interface org.jetbrains.** { *; } +-dontwarn org.jetbrains.** + + +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep class * extends com.bumptech.glide.module.AppGlideModule { + (...); +} +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; +} +-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { + *** rewind(); +} + +-dontwarn org.bouncycastle.jsse.BCSSLParameters +-dontwarn org.bouncycastle.jsse.BCSSLSocket +-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider +-dontwarn org.conscrypt.Conscrypt$Version +-dontwarn org.conscrypt.Conscrypt +-dontwarn org.conscrypt.ConscryptHostnameVerifier +-dontwarn org.openjsse.javax.net.ssl.SSLParameters +-dontwarn org.openjsse.javax.net.ssl.SSLSocket +-dontwarn org.openjsse.net.ssl.OpenJSSE + +# ViewBinding +-keepclassmembers class * implements androidx.viewbinding.ViewBinding { + public static * inflate(android.view.LayoutInflater); +} + +-dontwarn javax.annotation.** +-dontwarn javax.inject.** + +-dontwarn okhttp3.logging.** +-keep class okhttp3.internal.**{*;} +-dontwarn okio.** + +-dontwarn retrofit2.** +-keep class retrofit2.** { *; } +-keepattributes Signature +-keepattributes Exceptions + +-keep class com.google.gson.stream.** { *; } +-keepattributes EnclosingMethod + +-keepattributes *Annotation* +-keepclassmembers class * { + @org.greenrobot.eventbus.Subscribe ; +} +-keep enum org.greenrobot.eventbus.ThreadMode { *; } + +-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { + (java.lang.Throwable); +} + + + + +-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.** { *; } + + +-keepattributes Signature +-keepattributes *Annotation* +-keep class com.mbridge.** {*; } +-keep interface com.mbridge.** {*; } +-dontwarn com.mbridge.** +-keepclassmembers class **.R$* { public static final int mbridge*; } + +-keep public class com.mbridge.* extends androidx.** { *; } +-keep interface androidx.annotation.IntDef{*;} +-keep interface androidx.annotation.Nullable{*;} +-keep interface androidx.annotation.CheckResult{*;} +-keep interface androidx.annotation.NonNull{*;} +-keep public class androidx.fragment.app.Fragment{*;} +-keep public class androidx.core.content.FileProvider{*;} +-keep public class androidx.core.app.NotificationCompat{*;} +-keep public class androidx.appcompat.widget.AppCompatImageView {*;} +-keep public class androidx.recyclerview.*{*;} + + +-keepclassmembers class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} +#noinspection ShrinkerUnresolvedReference +#unity +-keep class com.google.android.gms.ads.** {public *;} +-keep class com.google.android.gms.appset.** { *; } +-keep class com.google.android.gms.tasks.** { *; } +#adapters +-keep class com.ironsource.adapters.** { *; } +#sdk +-dontwarn com.ironsource.** +-dontwarn com.ironsource.adapters.** +-keepclassmembers class com.ironsource.** { public *; } +-keep public class com.ironsource.** +-keep class com.ironsource.adapters.** { *; +} +#omid +-dontwarn com.iab.omid.** +-keep class com.iab.omid.** {*;} +#javascript +-keepattributes JavascriptInterface +-keepclassmembers class * { @android.webkit.JavascriptInterface ; } +#For AmazonAps integration +-keep class com.amazon.device.ads.DtbThreadService { + static *; +} +-keep public interface com.amazon.device.ads** {*; } +#For AppLovin integration +-keepclassmembers class com.applovin.sdk.AppLovinSdk { + static *; +} +-keep public interface com.applovin.sdk** {*; } +-keep public interface com.applovin.adview** {*; } +-keep public interface com.applovin.mediation** {*; } +-keep public interface com.applovin.communicator** {*; } +#For Bytedance integration +-keep public interface com.bytedance.sdk.openadsdk** {*; } +#For Facebook integration +-keepclassmembers class com.facebook.ads.internal.AdSdkVersion { + static *; +} +-keepclassmembers class com.facebook.ads.internal.settings.AdSdkVersion { + static *; + } +-keepclassmembers class com.facebook.ads.BuildConfig { + static *; + } +-keep public interface com.facebook.ads** {*; } +#For Fairbid +-keep public interface com.fyber.fairbid.ads.interstitial** {*; } +-keep public interface com.fyber.fairbid.ads.rewarded** {*; } +-keep class com.fyber.offerwall.* +#For Fivead +-keep public interface com.five_corp.ad** {*; } +#For Fyber(Inneractive) integration +-keep public interface com.fyber.inneractive.sdk.external** {*; } +-keep public interface com.fyber.inneractive.sdk.activities** {*; } +-keep public interface com.fyber.inneractive.sdk.ui** {*; } +#For HyprMX integration +-keepclassmembers class com.hyprmx.android.sdk.utility.HyprMXProperties { + static *; +} +-keepclassmembers class com.hyprmx.android.BuildConfig { + static *; +} +-keep public interface com.hyprmx.android.sdk.activity** {*; } +-keep public interface com.hyprmx.android.sdk.graphics** {*; } +# For Inmobi integration +-keep class com.inmobi.* +-keep public interface com.inmobi.ads.listeners** {*; } +-keep public interface com.inmobi.ads.InMobiInterstitial** {*; } +-keep public interface com.inmobi.ads.InMobiBanner** {*; } +# For ironSource integration +-keep public interface com.ironsource.mediationsdk.sdk** {*; } +-keep public interface com.ironsource.mediationsdk.impressionData.ImpressionDataListener {*; } +#For Maio integration +-keep public interface jp.maio.sdk.android.MaioAdsListenerInterface {*; } +# For Mintergral integration +-keep public interface com.mbridge.msdk.out** {*; } +-keep public interface com.mbridge.msdk.videocommon.listener** {*; } +-keep public interface com.mbridge.msdk.interstitialvideo.out** {*; } +-keep public interface com.mintegral.msdk.out** {*; } +-keep public interface com.mintegral.msdk.videocommon.listener** {*; } +-keep public interface com.mintegral.msdk.interstitialvideo.out** {*; } +#For MyTarget integration +-keep class com.my.target.** {*;} +#For Ogury integration +-keep public interface io.presage.interstitial** {*; } +-keep public interface io.presage.interstitial.PresageInterstitialCallback {*; } +#For Pubnative integration +-keep public interface net.pubnative.lite.sdk.interstitial.HyBidInterstitialAd** {*; } +-keep public interface net.pubnative.lite.sdk.rewarded.HyBidRewardedAd** {*; } +-keep public interface net.pubnative.lite.sdk.views.HyBidAdView** {*; } +#For Smaato integration +-keep public interface com.smaato.sdk.interstitial** {*; } +-keep public interface com.smaato.sdk.video.vast** {*; } +-keep public interface com.smaato.sdk.banner.widget** {*; } +-keep public interface com.smaato.sdk.core.util** {*; } +# For Tapjoy integration +-keep public interface com.tapjoy.** {*; } +# For Tencent integration +-keep public interface com.qq.e.ads.interstitial2** {*; } +-keep public interface com.qq.e.ads.interstitial3** {*; } +-keep public interface com.qq.e.ads.rewardvideo** {*; } +-keep public interface com.qq.e.ads.rewardvideo2** {*; } +-keep public interface com.qq.e.ads.banner2** {*; } +-keep public interface com.qq.e.comm.adevent** {*; } +#For Verizon integration +-keepclassmembers class com.verizon.ads.edition.BuildConfig { + static *; +} +-keep public interface com.verizon.ads.interstitialplacement** {*; } +-keep public interface com.verizon.ads.inlineplacement** {*; } +-keep public interface com.verizon.ads.vastcontroller** {*; } +-keep public interface com.verizon.ads.webcontroller** {*; } +#For Vungle integration +-keep public interface com.vungle.warren.PlayAdCallback {*; } +-keep public interface com.vungle.warren.ui.contract** {*; } +-keep public interface com.vungle.warren.ui.view** {*; } +#For AndroidX +-keep class androidx.localbroadcastmanager.content.LocalBroadcastManager { *;} +-keep class androidx.recyclerview.widget.RecyclerView { *;} +-keep class androidx.recyclerview.widget.RecyclerView$OnScrollListener { *;} +#For Android +-keep class * extends android.app.Activity + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3d2a93a..9046014 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,11 +6,10 @@ - + + + + - - - + + + diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHistoryAdapter.java b/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHistoryAdapter.java deleted file mode 100644 index 67eac7b..0000000 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHistoryAdapter.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.jelly.zyreotv.app.ui.adapter; - -import com.chad.library.adapter4.BaseQuickAdapter; - -import android.content.Context; -import android.view.ViewGroup; - -import com.chad.library.adapter4.viewholder.QuickViewHolder; -import com.jelly.zyreotv.app.R; - -public class VTSearchHistoryAdapter extends BaseQuickAdapter { - - @Override - protected void onBindViewHolder(QuickViewHolder holder, int position, String item) { - holder.setText(R.id.tv_item_vt_search_history, item); - } - - @Override - public QuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) { - return new QuickViewHolder(R.layout.item_search_history_vt, parent); - } -} - diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTop10ListAdapter.java b/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTop10ListAdapter.java deleted file mode 100644 index 3a93abd..0000000 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTop10ListAdapter.java +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (c) 2022 NetEase, Inc. All rights reserved. -// Use of this source code is governed by a MIT license that can be -// found in the LICENSE file. - -package com.jelly.zyreotv.app.ui.adapter; - -import android.content.Context; -import android.view.View; - -import com.bumptech.glide.Glide; -import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemHomeExploreVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.utils.TimeUtils; - - -public class VTTop10ListAdapter - extends VTCommonAdapter { - - private Context mcontext; - - public VTTop10ListAdapter( - Context context, Class viewBinding) { - super(context, viewBinding); - this.mcontext = context; - } - - - @Override - public void onBindViewHolder( - ItemHomeExploreVtBinding binding, - int position, - ItemBean data, - int bingingAdapterPosition) { - - if (data != null) { -// ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) binding.ivHotExploreItem.getLayoutParams(); -// params.dimensionRatio ="71:100"; -// binding.ivHotExploreItem.setLayoutParams(params); -// binding.ivHotExploreItem.requestLayout(); -// - Glide.with(mcontext) - .load(data.getImage_url()) - .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) - .into(binding.ivHotExploreItem); - binding.layoutHomeHotcontent.setVisibility(View.VISIBLE); - binding.tvHomeExplorecontentItem.setVisibility(View.GONE); - binding.tvHomeExploretitleItem.setText(data.getName()); - binding.tvHomeHotcontentItem.setText(TimeUtils.formatNumber(data.getWatch_total())); - binding.tvHomeExplorecateItem1.setVisibility(View.GONE); - binding.tvHomeExplorecateItem2.setVisibility(View.GONE); - binding.tvHotTopnumber.setVisibility(View.GONE); - if (bingingAdapterPosition < 10) { - binding.tvHotTopnumber.setVisibility(View.VISIBLE); - binding.tvHotTopnumber.setText(String.valueOf(bingingAdapterPosition + 1)); - } - if (data.getCategory() != null && !data.getCategory().isEmpty()) { - binding.tvHomeExplorecateItem1.setVisibility(View.VISIBLE); - binding.tvHomeExplorecateItem1.setText(data.getCategory().get(0)); - if (data.getCategory().size() >= 2) { - binding.tvHomeExplorecateItem2.setVisibility(View.VISIBLE); - binding.tvHomeExplorecateItem2.setText(data.getCategory().get(1)); - } - } - - } - } - - -} diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/VTStatusBarUtils.java b/app/src/main/java/com/jelly/zyreotv/app/utils/VTStatusBarUtils.java deleted file mode 100644 index c46d4da..0000000 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/VTStatusBarUtils.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.jelly.zyreotv.app.utils; - -import android.annotation.TargetApi; -import android.app.Activity; -import android.content.Context; -import android.content.res.Resources; -import android.util.TypedValue; -import android.os.Build; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; - -public class VTStatusBarUtils { - private static int DEFAULT_COLOR = 0; - private static float DEFAULT_ALPHA = 0f; - private static final int MIN_API = 19; - - public static void pageImmersive(Window window, int color) { - pageImmersive(window, color, 1f); - } - - public static void pageImmersive(Window window, int color, float alpha) { - if (Build.VERSION.SDK_INT >= 21) { - window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); - window.setStatusBarColor(pageMixtureColor(color, alpha)); - - int systemUiVisibility = window.getDecorView().getSystemUiVisibility(); - systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; - systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE; - window.getDecorView().setSystemUiVisibility(systemUiVisibility); - } else if (Build.VERSION.SDK_INT >= MIN_API) { - window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - pageSetTranslucentView((ViewGroup) window.getDecorView(), color, alpha); - } else { - int systemUiVisibility = window.getDecorView().getSystemUiVisibility(); - systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN; - systemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_STABLE; - window.getDecorView().setSystemUiVisibility(systemUiVisibility); - } - } - - public static void pageDarkMode(Activity activity, boolean dark) { - pageDarkMode(activity.getWindow(), DEFAULT_COLOR, DEFAULT_ALPHA, dark); - } - - @TargetApi(Build.VERSION_CODES.M) - public static void pageDarkMode(Window window, int color, float alpha, boolean dark) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - pageDarkModeForM(window, dark); - pageImmersive(window, color, alpha); - } else if (Build.VERSION.SDK_INT >= MIN_API) { - window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); - pageSetTranslucentView((ViewGroup) window.getDecorView(), color, alpha); - } else { - pageImmersive(window, color, alpha); - } - } - - @TargetApi(Build.VERSION_CODES.M) - public static void pageDarkModeForM(Window window, boolean dark) { - int systemUiVisibility = window.getDecorView().getSystemUiVisibility(); - if (dark) { - systemUiVisibility |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; - } else { - systemUiVisibility &= ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR; - } - window.getDecorView().setSystemUiVisibility(systemUiVisibility); - } - - public static void pageSetPaddingSmart(Context context, View view) { - if (Build.VERSION.SDK_INT >= MIN_API) { - ViewGroup.LayoutParams lp = view.getLayoutParams(); - if (lp != null && lp.height > 0) { - lp.height += pageGetStatusBarHeight(context); - } - view.setPadding( - view.getPaddingLeft(), - view.getPaddingTop() + pageGetStatusBarHeight(context), - view.getPaddingRight(), - view.getPaddingBottom() - ); - } - } - - private static void pageSetTranslucentView(ViewGroup container, int color, float alpha) { - if (Build.VERSION.SDK_INT >= MIN_API) { - int mixtureColor = pageMixtureColor(color, alpha); - View translucentView = container.findViewById(android.R.id.custom); - if (translucentView == null && mixtureColor != 0) { - translucentView = new View(container.getContext()); - translucentView.setId(android.R.id.custom); - ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - pageGetStatusBarHeight(container.getContext()) - ); - container.addView(translucentView, lp); - } - if (translucentView != null) { - translucentView.setBackgroundColor(mixtureColor); - } - } - } - - private static int pageMixtureColor(int color, float alpha) { - int a = (color & 0xff000000) == 0 ? 0xff : color >>> 24; - return (color & 0x00ffffff) | ((int) (a * alpha) << 24); - } - - private static int pageGetStatusBarHeight(Context context) { - int result = 24; - int resId = context.getResources().getIdentifier("status_bar_height", "dimen", "android"); - if (resId > 0) { - result = context.getResources().getDimensionPixelSize(resId); - } else { - result = (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, - result, - Resources.getSystem().getDisplayMetrics() - ); - } - return result; - } -} diff --git a/app/src/main/java/com/jelly/zyreotv/app/VTApplication.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/VTApplication.java similarity index 81% rename from app/src/main/java/com/jelly/zyreotv/app/VTApplication.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/VTApplication.java index d7ca151..14bcad9 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/VTApplication.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/VTApplication.java @@ -1,13 +1,13 @@ -package com.jelly.zyreotv.app; +package com.shortdrama.jelly.zyreotv; import android.app.Application; import android.text.TextUtils; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.model.RegisteredBean; -import com.jelly.zyreotv.app.utils.SharePreferenceUtils; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.model.RegisteredBean; +import com.shortdrama.jelly.zyreotv.utils.SharePreferenceUtils; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTApi.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApi.java similarity index 94% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTApi.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApi.java index 578e20c..073267b 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTApi.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApi.java @@ -1,7 +1,9 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; import android.util.Log; +import com.shortdrama.jelly.zyreotv.utils.LogUtils; + import java.io.UnsupportedEncodingException; import java.net.Proxy; import java.net.URLDecoder; @@ -50,7 +52,7 @@ public class VTApi extends VTBaseApi { builder.addInterceptor(new VTHeaderInterceptor()); builder.addInterceptor(new VTBodyloadInterceptor()); - if(!VTApiService.isProduce){ + if(LogUtils.isDebug){ HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor(message -> { try { String text = URLDecoder.decode(message, "utf-8"); diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTApiService.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApiService.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTApiService.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApiService.java index 461a0f4..4d3b0ab 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTApiService.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTApiService.java @@ -1,14 +1,14 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; -import com.jelly.zyreotv.app.model.VTVideoListBean; -import com.jelly.zyreotv.app.model.HomeTopBannerBean; -import com.jelly.zyreotv.app.model.HomeTopBean; -import com.jelly.zyreotv.app.model.RegisteredBean; -import com.jelly.zyreotv.app.model.TabItemBean; -import com.jelly.zyreotv.app.model.VTUserInfoBean; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.model.VTVideoExploreListBean; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.model.HomeTopBannerBean; +import com.shortdrama.jelly.zyreotv.model.HomeTopBean; +import com.shortdrama.jelly.zyreotv.model.RegisteredBean; +import com.shortdrama.jelly.zyreotv.model.TabItemBean; +import com.shortdrama.jelly.zyreotv.model.VTUserInfoBean; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.model.VTVideoExploreListBean; import io.reactivex.Observable; import retrofit2.http.Field; diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTBaseApi.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseApi.java similarity index 96% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTBaseApi.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseApi.java index 5d36ed4..da7049b 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTBaseApi.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseApi.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; import okhttp3.OkHttpClient; import retrofit2.Retrofit; diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTBaseObserver.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseObserver.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTBaseObserver.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseObserver.java index 0d91fdf..28a025d 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTBaseObserver.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBaseObserver.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; import com.google.gson.JsonParseException; diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTBodyloadInterceptor.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBodyloadInterceptor.java similarity index 81% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTBodyloadInterceptor.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBodyloadInterceptor.java index bc17c2f..a9d1064 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTBodyloadInterceptor.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTBodyloadInterceptor.java @@ -1,10 +1,7 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; -import android.util.Log; - - -import com.jelly.zyreotv.app.utils.VTDecyrptUtils; +import com.shortdrama.jelly.zyreotv.utils.VTDecyrptUtils; import okhttp3.Interceptor; import okhttp3.Response; @@ -20,13 +17,11 @@ public class VTBodyloadInterceptor implements Interceptor { String activity = k_center.body().contentType().toString(); String circle = k_center.body().string(); String str =circle; - Log.i("okhttp",circle+" "); try{ str = VTDecyrptUtils.decrypt(circle); }catch (Exception e){ } - Log.i("okhttp str",str+" "); ResponseBody current = ResponseBody.create(k_center.body().contentType(), str); return k_center.newBuilder().body(current).build(); } else { diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTHeaderInterceptor.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTHeaderInterceptor.java similarity index 74% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTHeaderInterceptor.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTHeaderInterceptor.java index 14cfbe3..74fc5b6 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTHeaderInterceptor.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTHeaderInterceptor.java @@ -1,11 +1,11 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; import java.io.IOException; -import com.jelly.zyreotv.app.VTApplication; -import com.jelly.zyreotv.app.utils.GetAndroidUniqueMark; -import com.jelly.zyreotv.app.utils.SharePreferenceUtils; -import com.jelly.zyreotv.app.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.VTApplication; +import com.shortdrama.jelly.zyreotv.utils.GetAndroidUniqueMark; +import com.shortdrama.jelly.zyreotv.utils.SharePreferenceUtils; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; import okhttp3.Interceptor; import okhttp3.Request; @@ -23,6 +23,7 @@ public class VTHeaderInterceptor implements Interceptor { .addHeader("Content-Type", "application/json") .addHeader("authorization", SharePreferenceUtils.getString(SharePreferenceUtils.auth,"")) // .addHeader("security","true") + .addHeader("app-name","ZyreoTV") .addHeader("lang-key","en") .addHeader("device-id",GetAndroidUniqueMark.getUniqueId(VTApplication.getAppContext())) .addHeader("system-type","android") diff --git a/app/src/main/java/com/jelly/zyreotv/app/api/VTResult.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTResult.java similarity index 83% rename from app/src/main/java/com/jelly/zyreotv/app/api/VTResult.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTResult.java index 1e79c75..df816fc 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/api/VTResult.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/api/VTResult.java @@ -1,7 +1,7 @@ -package com.jelly.zyreotv.app.api; +package com.shortdrama.jelly.zyreotv.api; -import com.jelly.zyreotv.app.utils.VTGsonUtils; +import com.shortdrama.jelly.zyreotv.utils.VTGsonUtils; import java.io.Serializable; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/CateGoryItemBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/CateGoryItemBean.java similarity index 91% rename from app/src/main/java/com/jelly/zyreotv/app/model/CateGoryItemBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/CateGoryItemBean.java index 0163d8d..4b7b9cb 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/CateGoryItemBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/CateGoryItemBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class CateGoryItemBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/HomeNineSquareBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeNineSquareBean.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/model/HomeNineSquareBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeNineSquareBean.java index 11ef4a7..9624ace 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/HomeNineSquareBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeNineSquareBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBannerBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBannerBean.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBannerBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBannerBean.java index d74b42d..6f13ac8 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBannerBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBannerBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBean.java similarity index 91% rename from app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBean.java index e294b03..c4a52b6 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/HomeTopBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/HomeTopBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; @@ -12,6 +12,8 @@ public class HomeTopBean { private List category; + + public List getHotData() { return hotData; } diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/ItemBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/ItemBean.java similarity index 99% rename from app/src/main/java/com/jelly/zyreotv/app/model/ItemBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/ItemBean.java index 4a42fde..a18625c 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/ItemBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/ItemBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/RegisteredBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/RegisteredBean.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/model/RegisteredBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/RegisteredBean.java index f7891c8..07a8e45 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/RegisteredBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/RegisteredBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class RegisteredBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/SearchCateGoryItemBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/SearchCateGoryItemBean.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/model/SearchCateGoryItemBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/SearchCateGoryItemBean.java index 7eff860..24599de 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/SearchCateGoryItemBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/SearchCateGoryItemBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class SearchCateGoryItemBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/TabItemBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/TabItemBean.java similarity index 85% rename from app/src/main/java/com/jelly/zyreotv/app/model/TabItemBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/TabItemBean.java index b687e6b..5e4581f 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/TabItemBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/TabItemBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/TranslatesResBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/TranslatesResBean.java similarity index 99% rename from app/src/main/java/com/jelly/zyreotv/app/model/TranslatesResBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/TranslatesResBean.java index 6d01aed..365ea52 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/TranslatesResBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/TranslatesResBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTAccountInfoBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTAccountInfoBean.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTAccountInfoBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTAccountInfoBean.java index 6129b98..908a04d 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTAccountInfoBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTAccountInfoBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class VTAccountInfoBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTBaseData.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTBaseData.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTBaseData.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTBaseData.java index 111ca99..59fe0db 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTBaseData.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTBaseData.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class VTBaseData { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTUserInfoBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTUserInfoBean.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTUserInfoBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTUserInfoBean.java index fa64a1d..6bbf3f8 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTUserInfoBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTUserInfoBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class VTUserInfoBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoDetailsBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoDetailsBean.java similarity index 99% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTVideoDetailsBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoDetailsBean.java index 4f04d43..e1b9f67 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoDetailsBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoDetailsBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreBean.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreBean.java index 1e84b00..8869f72 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; public class VTVideoExploreBean { diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreListBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreListBean.java similarity index 86% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreListBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreListBean.java index 40deade..0a41623 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoExploreListBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoExploreListBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoListBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoListBean.java similarity index 91% rename from app/src/main/java/com/jelly/zyreotv/app/model/VTVideoListBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoListBean.java index b2b7304..4f23b21 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VTVideoListBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VTVideoListBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/model/VideoInfoBean.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VideoInfoBean.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/model/VideoInfoBean.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/model/VideoInfoBean.java index 83030ea..248122a 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/model/VideoInfoBean.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/model/VideoInfoBean.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.model; +package com.shortdrama.jelly.zyreotv.model; import android.os.Parcel; import android.os.Parcelable; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTMainActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTMainActivity.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTMainActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTMainActivity.java index 02f851a..3637375 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTMainActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTMainActivity.java @@ -1,18 +1,18 @@ -package com.jelly.zyreotv.app.ui.activity; +package com.shortdrama.jelly.zyreotv.ui.activity; import androidx.appcompat.widget.AppCompatTextView; import androidx.fragment.app.Fragment; import android.view.View; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ActivityMainVtBinding; -import com.jelly.zyreotv.app.ui.activity.basic.VTCommonActivity; -import com.jelly.zyreotv.app.ui.activity.explore.VTExploreFragment; -import com.jelly.zyreotv.app.ui.activity.home.VTHomeFragment; -import com.jelly.zyreotv.app.ui.activity.me.VTMeFragment; -import com.jelly.zyreotv.app.ui.activity.mylist.VTMyListFragment; -import com.jelly.zyreotv.app.ui.adapter.VTFragmentAdapter; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ActivityMainVtBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTCommonActivity; +import com.shortdrama.jelly.zyreotv.ui.activity.explore.VTExploreFragment; +import com.shortdrama.jelly.zyreotv.ui.activity.home.VTHomeFragment; +import com.shortdrama.jelly.zyreotv.ui.activity.me.VTMeFragment; +import com.shortdrama.jelly.zyreotv.ui.activity.mylist.VTMyListFragment; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTFragmentAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTSplashActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTSplashActivity.java similarity index 80% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTSplashActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTSplashActivity.java index a348ff6..55dcc06 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/VTSplashActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/VTSplashActivity.java @@ -1,12 +1,12 @@ -package com.jelly.zyreotv.app.ui.activity; +package com.shortdrama.jelly.zyreotv.ui.activity; import android.content.Intent; import android.os.Bundle; import androidx.core.splashscreen.SplashScreen; -import com.jelly.zyreotv.app.databinding.ActivitySplashBinding; -import com.jelly.zyreotv.app.ui.activity.basic.VTCommonActivity; +import com.shortdrama.jelly.zyreotv.databinding.ActivitySplashBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTCommonActivity; public class VTSplashActivity extends VTCommonActivity { diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/WebViewActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/WebViewActivity.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/WebViewActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/WebViewActivity.java index 4f10e4e..9561a06 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/WebViewActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/WebViewActivity.java @@ -1,11 +1,11 @@ -package com.jelly.zyreotv.app.ui.activity; +package com.shortdrama.jelly.zyreotv.ui.activity; import android.webkit.CookieManager; import android.webkit.WebSettings; -import com.jelly.zyreotv.app.databinding.ActivityWebviewBinding; -import com.jelly.zyreotv.app.ui.activity.basic.VTCommonActivity; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.databinding.ActivityWebviewBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTCommonActivity; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; public class WebViewActivity extends VTCommonActivity { diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTBaseEventBus.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTBaseEventBus.java similarity index 95% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTBaseEventBus.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTBaseEventBus.java index 2b06895..26c65ed 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTBaseEventBus.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTBaseEventBus.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.basic; +package com.shortdrama.jelly.zyreotv.ui.activity.basic; public class VTBaseEventBus { private final String code; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonActivity.java similarity index 95% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonActivity.java index 2e1a7a9..e8e3cee 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonActivity.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.basic; +package com.shortdrama.jelly.zyreotv.ui.activity.basic; import androidx.appcompat.app.AppCompatActivity; @@ -8,7 +8,7 @@ import android.os.Bundle; import android.widget.EditText; import android.view.inputmethod.InputMethodManager; -import com.jelly.zyreotv.app.utils.VTStatusBarUtils; +import com.shortdrama.jelly.zyreotv.utils.VTStatusBarUtils; public abstract class VTCommonActivity extends AppCompatActivity { // 定义一个泛型类型的成员变量 _viewBinding，初始值为 null diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonFragment.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonFragment.java index f9b40f2..7b48111 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/basic/VTCommonFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/basic/VTCommonFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.basic; +package com.shortdrama.jelly.zyreotv.ui.activity.basic; import android.content.Context; import android.os.Bundle; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/explore/VTExploreFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/explore/VTExploreFragment.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/explore/VTExploreFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/explore/VTExploreFragment.java index bedf5a6..c5ddadc 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/explore/VTExploreFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/explore/VTExploreFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.explore; +package com.shortdrama.jelly.zyreotv.ui.activity.explore; import android.annotation.SuppressLint; import android.os.Bundle; @@ -15,21 +15,21 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.widget.ViewPager2; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.VTApplication; -import com.jelly.zyreotv.app.databinding.FragmentExploreVtBinding; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.model.VTVideoExploreBean; -import com.jelly.zyreotv.app.ui.activity.basic.VTBaseEventBus; -import com.jelly.zyreotv.app.ui.activity.home.MainViewModel; -import com.jelly.zyreotv.app.ui.adapter.VTGooglePlayerExploreAdapter; -import com.jelly.zyreotv.app.ui.view.VTHomeGoogleExoPlayerView; -import com.jelly.zyreotv.app.utils.IntentUtils; -import com.jelly.zyreotv.app.utils.SingleClickUtils; -import com.jelly.zyreotv.app.utils.TimeUtils; -import com.jelly.zyreotv.app.utils.ToastUtils; -import com.jelly.zyreotv.app.utils.TranslatesUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.VTApplication; +import com.shortdrama.jelly.zyreotv.databinding.FragmentExploreVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.model.VTVideoExploreBean; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTBaseEventBus; +import com.shortdrama.jelly.zyreotv.ui.activity.home.MainViewModel; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTGooglePlayerExploreAdapter; +import com.shortdrama.jelly.zyreotv.ui.view.VTHomeGoogleExoPlayerView; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.utils.SingleClickUtils; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.utils.ToastUtils; +import com.shortdrama.jelly.zyreotv.utils.TranslatesUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/MainViewModel.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/MainViewModel.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/MainViewModel.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/MainViewModel.java index 42f3efd..4803b5e 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/MainViewModel.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/MainViewModel.java @@ -1,14 +1,12 @@ -package com.jelly.zyreotv.app.ui.activity.home; - -import android.util.Log; +package com.shortdrama.jelly.zyreotv.ui.activity.home; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.model.VTVideoExploreListBean; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.model.VTVideoExploreListBean; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -46,7 +44,6 @@ public class MainViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); exploreVideoList.setValue(null); } }); @@ -64,7 +61,6 @@ public class MainViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); collectionLiveData.setValue(null); } }); @@ -82,7 +78,6 @@ public class MainViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); collectioncancelLiveData.setValue(null); } }); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHomeFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHomeFragment.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHomeFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHomeFragment.java index 5031f40..e368d90 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHomeFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHomeFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.home; +package com.shortdrama.jelly.zyreotv.ui.activity.home; import androidx.lifecycle.ViewModelProvider; @@ -14,16 +14,16 @@ import android.view.View; import android.view.ViewGroup; import com.google.android.material.tabs.TabLayoutMediator; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.databinding.FragmentMainVtBinding; -import com.jelly.zyreotv.app.model.CateGoryItemBean; -import com.jelly.zyreotv.app.model.HomeTopBean; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.ui.adapter.VTTabCommonAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.databinding.FragmentMainVtBinding; +import com.shortdrama.jelly.zyreotv.model.CateGoryItemBean; +import com.shortdrama.jelly.zyreotv.model.HomeTopBean; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTTabCommonAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; import java.util.ArrayList; import java.util.List; @@ -114,6 +114,7 @@ public class VTHomeFragment extends Fragment { } VTTabCommonAdapter adapter = new VTTabCommonAdapter(getActivity(), titles, listFragment); binding.viewpager.setAdapter(adapter); + binding.viewpager.setOffscreenPageLimit(listFragment.size()); //把TabLayout（选项卡布局）和ViewPager2绑定在一起。特别说明一下，下面这行代码是官方给的，特别好使。 new TabLayoutMediator(binding.tablayout, binding.viewpager, (tab, position) -> tab.setText(titles.get(position))).attach(); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHotFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHotFragment.java similarity index 89% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHotFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHotFragment.java index 158b030..1af0c01 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTHotFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTHotFragment.java @@ -1,10 +1,9 @@ -package com.jelly.zyreotv.app.ui.activity.home; +package com.shortdrama.jelly.zyreotv.ui.activity.home; import static android.view.View.GONE; import static android.view.View.VISIBLE; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,20 +15,20 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.databinding.FragmentHotVtBinding; -import com.jelly.zyreotv.app.databinding.ItemHomeExploreVtBinding; -import com.jelly.zyreotv.app.databinding.ItemHotSquareVtBinding; -import com.jelly.zyreotv.app.model.VTVideoListBean; -import com.jelly.zyreotv.app.model.HomeNineSquareBean; -import com.jelly.zyreotv.app.model.HomeTopBannerBean; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.ui.adapter.VTBannerHomeAdapter; -import com.jelly.zyreotv.app.ui.adapter.VTHotBottomListAdapter; -import com.jelly.zyreotv.app.ui.adapter.VTNineSquareAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.databinding.FragmentHotVtBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemHomeExploreVtBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemHotSquareVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.model.HomeNineSquareBean; +import com.shortdrama.jelly.zyreotv.model.HomeTopBannerBean; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTBannerHomeAdapter; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTHotBottomListAdapter; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTNineSquareAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; import com.youth.banner.listener.OnBannerListener; import java.util.List; @@ -209,8 +208,6 @@ public class VTHotFragment extends Fragment { .setOnBannerListener(new OnBannerListener() { @Override public void OnBannerClick(Object data, int position) { - ItemBean bean = itemBeans.get(position); - Log.i("tag====",bean.getShort_play_id()+" "); IntentUtils.startPlayerDetails(getActivity(), itemBeans.get(position).getShort_play_id(), 0); } }) diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTabItemFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTabItemFragment.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTabItemFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTabItemFragment.java index 75a1398..170b86b 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTabItemFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTabItemFragment.java @@ -1,7 +1,6 @@ -package com.jelly.zyreotv.app.ui.activity.home; +package com.shortdrama.jelly.zyreotv.ui.activity.home; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -14,17 +13,17 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.databinding.FragmentCategoryItemBinding; -import com.jelly.zyreotv.app.databinding.ItemHomeTablistVtBinding; -import com.jelly.zyreotv.app.model.VTVideoListBean; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.model.TabItemBean; -import com.jelly.zyreotv.app.ui.adapter.VTBannerHomeAdapter; -import com.jelly.zyreotv.app.ui.adapter.VTTabItemListAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.databinding.FragmentCategoryItemBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemHomeTablistVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.model.TabItemBean; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTBannerHomeAdapter; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTTabItemListAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; import java.util.List; @@ -131,10 +130,7 @@ public class VTTabItemFragment extends Fragment { if (newState == RecyclerView.SCROLL_STATE_IDLE) { int position = layoutManager.findLastCompletelyVisibleItemPosition(); int position2 = layoutManager.findLastVisibleItemPosition(); - Log.i("Home+++++++++++++++", "position==" + position); - Log.i("Home+++++++++++++++", "position2==" + position2); if (position == adapter.getItemCount() - 1) { - Log.i("Home+++++++++++++++", "page++++"); currentPage++; getBottomData(); } @@ -175,7 +171,7 @@ public class VTTabItemFragment extends Fragment { adapter.addDataList(feedbackResp.data.getList(), false); } }else{ - if (currentPage==1&&binding.banner.getVisibility()==View.GONE){ + if (currentPage==1){ binding.ivEmptyData.setVisibility(View.VISIBLE); } } diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTopFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTopFragment.java similarity index 81% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTopFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTopFragment.java index 1f50a08..62a91d0 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/home/VTTopFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/home/VTTopFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.home; +package com.shortdrama.jelly.zyreotv.ui.activity.home; import android.os.Bundle; import android.view.LayoutInflater; @@ -11,17 +11,17 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTApiService; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTApiService; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; -import com.jelly.zyreotv.app.databinding.FragmentTopVtBinding; -import com.jelly.zyreotv.app.databinding.ItemHomeExploreVtBinding; -import com.jelly.zyreotv.app.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.databinding.FragmentTopVtBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemHomeExploreVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; -import com.jelly.zyreotv.app.ui.adapter.VTTop10ListAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTTop10ListAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTMeFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTMeFragment.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTMeFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTMeFragment.java index 45cc072..84f49cd 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTMeFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTMeFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.me; +package com.shortdrama.jelly.zyreotv.ui.activity.me; import android.content.Intent; import android.os.Bundle; @@ -13,14 +13,14 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.LinearLayoutManager; import com.bumptech.glide.Glide; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.api.VTApiService; -import com.jelly.zyreotv.app.databinding.FragmentMeBinding; -import com.jelly.zyreotv.app.databinding.ItemVideoHistoryBinding; -import com.jelly.zyreotv.app.ui.activity.WebViewActivity; -import com.jelly.zyreotv.app.ui.adapter.VTUserVideoHistoryAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.api.VTApiService; +import com.shortdrama.jelly.zyreotv.databinding.FragmentMeBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemVideoHistoryBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.WebViewActivity; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTUserVideoHistoryAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTUserViewModel.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTUserViewModel.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTUserViewModel.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTUserViewModel.java index 14eaf8e..c4f3a9c 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/me/VTUserViewModel.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/me/VTUserViewModel.java @@ -1,15 +1,13 @@ -package com.jelly.zyreotv.app.ui.activity.me; - -import android.util.Log; +package com.shortdrama.jelly.zyreotv.ui.activity.me; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.model.VTUserInfoBean; -import com.jelly.zyreotv.app.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.model.VTUserInfoBean; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -50,7 +48,6 @@ public class VTUserViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); userInfoLiveData.setValue(null); } }); @@ -69,7 +66,6 @@ public class VTUserViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); userVideoHistoryLiveData.setValue(null); } }); @@ -87,7 +83,6 @@ public class VTUserViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); userFollowListLiveData.setValue(null); } }); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTFollowListFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTFollowListFragment.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTFollowListFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTFollowListFragment.java index d7115d1..6575293 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTFollowListFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTFollowListFragment.java @@ -1,10 +1,9 @@ -package com.jelly.zyreotv.app.ui.activity.mylist; +package com.shortdrama.jelly.zyreotv.ui.activity.mylist; import static android.view.View.GONE; import static android.view.View.VISIBLE; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,16 +14,16 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.FragmentMylistFollowlistBinding; -import com.jelly.zyreotv.app.databinding.ItemMylistFollowlistVtBinding; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.ui.activity.basic.VTBaseEventBus; -import com.jelly.zyreotv.app.ui.activity.me.VTUserViewModel; -import com.jelly.zyreotv.app.ui.activity.play.VTVideoViewModel; -import com.jelly.zyreotv.app.ui.adapter.VTMyListFollowAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.FragmentMylistFollowlistBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemMylistFollowlistVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTBaseEventBus; +import com.shortdrama.jelly.zyreotv.ui.activity.me.VTUserViewModel; +import com.shortdrama.jelly.zyreotv.ui.activity.play.VTVideoViewModel; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTMyListFollowAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -124,7 +123,6 @@ public class VTFollowListFragment extends Fragment { shortPlayInfo.setIs_collect(false); EventBus.getDefault().post(new VTBaseEventBus<>(VTAppConstants.Constants_Episodes_Series_DataExample, shortPlayInfo)); List fragments = getParentFragmentManager().getFragments(); - Log.i(" ","fragments=="+fragments.size()); for (Fragment fragment:fragments){ if(fragment instanceof VTMyListFragment){ ((VTMyListFragment)fragment).setCancelView(); @@ -166,10 +164,12 @@ public class VTFollowListFragment extends Fragment { adapter.addDataList(vtResult.data.getList(), currentPage == 1); }else{ // binding.layoutMylistfollowEmpty.setVisibility(View.VISIBLE); - binding.recyclerviewMylistFollow.setVisibility(GONE); - binding.ivFollowEmpty.setVisibility(VISIBLE); + if(currentPage==1){ + binding.recyclerviewMylistFollow.setVisibility(GONE); + binding.ivFollowEmpty.setVisibility(VISIBLE); + } + } - Log.i("tag count","count=="+adapter.getItemCount()); List fragments = getParentFragmentManager().getFragments(); for (Fragment fragment:fragments){ if(fragment instanceof VTMyListFragment){ diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTMyListFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTMyListFragment.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTMyListFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTMyListFragment.java index f660bfe..a893536 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTMyListFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTMyListFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.mylist; +package com.shortdrama.jelly.zyreotv.ui.activity.mylist; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -13,9 +13,9 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import com.google.android.material.tabs.TabLayoutMediator; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.FragmentMylistBinding; -import com.jelly.zyreotv.app.ui.adapter.VTTabCommonAdapter; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.FragmentMylistBinding; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTTabCommonAdapter; import java.util.ArrayList; import java.util.List; @@ -102,7 +102,7 @@ public class VTMyListFragment extends Fragment { public void setDeleteView(boolean isVisible){ binding.tvMylistCancel.setVisibility(GONE); - binding.ivMylistDelete.setVisibility(isVisible?VISIBLE:GONE); + binding.ivMylistDelete.setVisibility(GONE); } } \ No newline at end of file diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTPlayListFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTPlayListFragment.java similarity index 86% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTPlayListFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTPlayListFragment.java index 90413e8..0004136 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/mylist/VTPlayListFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/mylist/VTPlayListFragment.java @@ -1,10 +1,9 @@ -package com.jelly.zyreotv.app.ui.activity.mylist; +package com.shortdrama.jelly.zyreotv.ui.activity.mylist; import static android.view.View.GONE; import static android.view.View.VISIBLE; import android.os.Bundle; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -15,12 +14,12 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.GridLayoutManager; -import com.jelly.zyreotv.app.databinding.FragmentMylistPlaylistBinding; -import com.jelly.zyreotv.app.databinding.ItemMylistPlaylistVtBinding; -import com.jelly.zyreotv.app.ui.activity.me.VTUserViewModel; -import com.jelly.zyreotv.app.ui.adapter.VTMyListPlayAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.databinding.FragmentMylistPlaylistBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemMylistPlaylistVtBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.me.VTUserViewModel; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTMyListPlayAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; @@ -112,12 +111,14 @@ public class VTPlayListFragment extends Fragment { // binding.layoutMylistfollowEmpty.setVisibility(View.GONE); binding.recyclerviewMylistPlay.setVisibility(View.VISIBLE); binding.ivPlaylistEmpty.setVisibility(GONE); - Log.i("tag","result==="+vtResult.data); if(vtResult!=null&&vtResult.data!=null&& !vtResult.data.getList().isEmpty()){ adapter.addDataList(vtResult.data.getList(), currentPage == 1); }else{ - binding.recyclerviewMylistPlay.setVisibility(GONE); - binding.ivPlaylistEmpty.setVisibility(VISIBLE); + if(currentPage==1){ + binding.recyclerviewMylistPlay.setVisibility(GONE); + binding.ivPlaylistEmpty.setVisibility(VISIBLE); + } + } }); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTEpisodesSelectDialogFragment.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTEpisodesSelectDialogFragment.java similarity index 91% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTEpisodesSelectDialogFragment.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTEpisodesSelectDialogFragment.java index 6e47c1f..bfa0491 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTEpisodesSelectDialogFragment.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTEpisodesSelectDialogFragment.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.play; +package com.shortdrama.jelly.zyreotv.ui.activity.play; import android.app.Dialog; import android.os.Bundle; @@ -9,11 +9,11 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.DialogFragment; import androidx.recyclerview.widget.GridLayoutManager; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.DialogPageEpisodesSelectVtBinding; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.ui.adapter.VTEpisodesSeriesAdapter; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.DialogPageEpisodesSelectVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTEpisodesSeriesAdapter; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoPlayerActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoPlayerActivity.java similarity index 96% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoPlayerActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoPlayerActivity.java index 703dc6a..ffdc877 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoPlayerActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoPlayerActivity.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.play; +package com.shortdrama.jelly.zyreotv.ui.activity.play; import android.annotation.SuppressLint; @@ -11,20 +11,20 @@ import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager2.widget.ViewPager2; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.VTApplication; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.databinding.ActivityVideoDetailsVtBinding; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.ui.activity.basic.VTBaseEventBus; -import com.jelly.zyreotv.app.ui.activity.basic.VTCommonActivity; -import com.jelly.zyreotv.app.ui.adapter.VTGooglePlayerAdapter; -import com.jelly.zyreotv.app.ui.view.VTGoogleExoPlayerView; -import com.jelly.zyreotv.app.utils.SingleClickUtils; -import com.jelly.zyreotv.app.utils.TimeUtils; -import com.jelly.zyreotv.app.utils.ToastUtils; -import com.jelly.zyreotv.app.utils.TranslatesUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.VTApplication; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.databinding.ActivityVideoDetailsVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTBaseEventBus; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTCommonActivity; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTGooglePlayerAdapter; +import com.shortdrama.jelly.zyreotv.ui.view.VTGoogleExoPlayerView; +import com.shortdrama.jelly.zyreotv.utils.SingleClickUtils; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.utils.ToastUtils; +import com.shortdrama.jelly.zyreotv.utils.TranslatesUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoViewModel.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoViewModel.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoViewModel.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoViewModel.java index 8a85cf5..634607e 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/play/VTVideoViewModel.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/play/VTVideoViewModel.java @@ -1,14 +1,12 @@ -package com.jelly.zyreotv.app.ui.activity.play; - -import android.util.Log; +package com.shortdrama.jelly.zyreotv.ui.activity.play; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -40,13 +38,11 @@ public class VTVideoViewModel extends ViewModel { .subscribe(new VTBaseObserver>() { @Override public void onSuccess(VTResult feedbackResp) { - Log.i("tag===", feedbackResp.data.shortPlayInfo.getShort_id() + ""); getVideoDetailsLiveData.setValue(feedbackResp); } @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); } }); } @@ -80,7 +76,6 @@ public class VTVideoViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); collectionLiveData.setValue(null); } }); @@ -98,7 +93,6 @@ public class VTVideoViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); collectioncancelLiveData.setValue(null); } }); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchActivity.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchActivity.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchActivity.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchActivity.java index f5734f5..a636116 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchActivity.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchActivity.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.activity.search; +package com.shortdrama.jelly.zyreotv.ui.activity.search; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -13,17 +13,17 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.StaggeredGridLayoutManager; import com.google.gson.reflect.TypeToken; -import com.jelly.zyreotv.app.databinding.ActivitySearchVtBinding; -import com.jelly.zyreotv.app.databinding.ItemSearchDataVtBinding; -import com.jelly.zyreotv.app.databinding.ItemSearchHotVtBinding; -import com.jelly.zyreotv.app.ui.activity.basic.VTCommonActivity; -import com.jelly.zyreotv.app.ui.adapter.VTSearchDataAdapter; -import com.jelly.zyreotv.app.ui.adapter.VTSearchHistoryAdapter; -import com.jelly.zyreotv.app.ui.adapter.VTSearchHotListAdapter; -import com.jelly.zyreotv.app.utils.IntentUtils; -import com.jelly.zyreotv.app.utils.SharePreferenceUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; -import com.jelly.zyreotv.app.utils.VTGsonUtils; +import com.shortdrama.jelly.zyreotv.databinding.ActivitySearchVtBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemSearchDataVtBinding; +import com.shortdrama.jelly.zyreotv.databinding.ItemSearchHotVtBinding; +import com.shortdrama.jelly.zyreotv.ui.activity.basic.VTCommonActivity; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTSearchDataAdapter; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTSearchHistoryAdapter; +import com.shortdrama.jelly.zyreotv.ui.adapter.VTSearchHotListAdapter; +import com.shortdrama.jelly.zyreotv.utils.IntentUtils; +import com.shortdrama.jelly.zyreotv.utils.SharePreferenceUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.utils.VTGsonUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchViewModel.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchViewModel.java similarity index 86% rename from app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchViewModel.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchViewModel.java index a174648..e3063ce 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/activity/search/VTSearchViewModel.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/activity/search/VTSearchViewModel.java @@ -1,14 +1,12 @@ -package com.jelly.zyreotv.app.ui.activity.search; - -import android.util.Log; +package com.shortdrama.jelly.zyreotv.ui.activity.search; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import com.jelly.zyreotv.app.api.VTApi; -import com.jelly.zyreotv.app.api.VTBaseObserver; -import com.jelly.zyreotv.app.api.VTResult; -import com.jelly.zyreotv.app.model.VTVideoListBean; +import com.shortdrama.jelly.zyreotv.api.VTApi; +import com.shortdrama.jelly.zyreotv.api.VTBaseObserver; +import com.shortdrama.jelly.zyreotv.api.VTResult; +import com.shortdrama.jelly.zyreotv.model.VTVideoListBean; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.schedulers.Schedulers; @@ -41,7 +39,6 @@ public class VTSearchViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); searchHotListLiveData.setValue(null); } @@ -61,7 +58,6 @@ public class VTSearchViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); searchDataListLiveData.setValue(null); } }); @@ -80,7 +76,6 @@ public class VTSearchViewModel extends ViewModel { @Override public void onError(int code, String msg) { - Log.i("tag===", msg + ""); } }); } diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTBannerHomeAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTBannerHomeAdapter.java similarity index 94% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTBannerHomeAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTBannerHomeAdapter.java index 9834403..f2f5e00 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTBannerHomeAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTBannerHomeAdapter.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.view.LayoutInflater; import android.view.View; @@ -10,8 +10,8 @@ import androidx.appcompat.widget.AppCompatTextView; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.model.ItemBean; import com.youth.banner.adapter.BannerAdapter; import java.util.List; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTCommonAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTCommonAdapter.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTCommonAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTCommonAdapter.java index c8258eb..db956e7 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTCommonAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTCommonAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTEpisodesSeriesAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTEpisodesSeriesAdapter.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTEpisodesSeriesAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTEpisodesSeriesAdapter.java index 5c2ddee..7a27b3d 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTEpisodesSeriesAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTEpisodesSeriesAdapter.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.annotation.SuppressLint; import android.content.Context; @@ -8,8 +8,8 @@ import android.widget.RelativeLayout; import androidx.appcompat.widget.AppCompatTextView; import com.chad.library.adapter4.BaseQuickAdapter; import com.chad.library.adapter4.viewholder.QuickViewHolder; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; public class VTEpisodesSeriesAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTFragmentAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTFragmentAdapter.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTFragmentAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTFragmentAdapter.java index 5dc9852..5d8d627 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTFragmentAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTFragmentAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerAdapter.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerAdapter.java index d6732f1..47c350c 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import android.view.ViewGroup; @@ -14,9 +14,9 @@ import androidx.media3.ui.PlayerView; import com.chad.library.adapter4.BaseQuickAdapter; import com.chad.library.adapter4.viewholder.QuickViewHolder; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.ui.view.VTGoogleExoPlayerView; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.ui.view.VTGoogleExoPlayerView; public class VTGooglePlayerAdapter diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerExploreAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerExploreAdapter.java similarity index 91% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerExploreAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerExploreAdapter.java index f0762d5..041deba 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTGooglePlayerExploreAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTGooglePlayerExploreAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import android.view.ViewGroup; @@ -14,9 +14,9 @@ import androidx.media3.ui.PlayerView; import com.chad.library.adapter4.BaseQuickAdapter; import com.chad.library.adapter4.viewholder.QuickViewHolder; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.model.VTVideoExploreBean; -import com.jelly.zyreotv.app.ui.view.VTHomeGoogleExoPlayerView; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.model.VTVideoExploreBean; +import com.shortdrama.jelly.zyreotv.ui.view.VTHomeGoogleExoPlayerView; public class VTGooglePlayerExploreAdapter diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTHotBottomListAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTHotBottomListAdapter.java similarity index 87% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTHotBottomListAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTHotBottomListAdapter.java index f18fe83..9f40db7 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTHotBottomListAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTHotBottomListAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import android.view.View; @@ -10,9 +10,9 @@ import android.view.View; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemHomeExploreVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemHomeExploreVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; /** * Home Hotbottom Home Top10 @@ -39,7 +39,6 @@ public class VTHotBottomListAdapter Glide.with(mcontext) .load(data.getImage_url()) .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) .into(binding.ivHotExploreItem); binding.tvHomeExploretitleItem.setText(data.getName()); binding.tvHomeExplorecontentItem.setText(data.getDescription()); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListFollowAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListFollowAdapter.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListFollowAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListFollowAdapter.java index 24279f9..c9847aa 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListFollowAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListFollowAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import static android.view.View.GONE; import static android.view.View.VISIBLE; @@ -12,9 +12,9 @@ import android.content.Context; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemMylistFollowlistVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemMylistFollowlistVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; public class VTMyListFollowAdapter @@ -64,7 +64,6 @@ public class VTMyListFollowAdapter Glide.with(mcontext) .load(data.getImage_url()) .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE)) .into(binding.ivMylistFollowlistItem); binding.tvMylistFollowlistName.setText(data.getName()); binding.ivMylistSelector.setVisibility(GONE); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListPlayAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListPlayAdapter.java similarity index 81% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListPlayAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListPlayAdapter.java index b2ffa10..bb79b30 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTMyListPlayAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTMyListPlayAdapter.java @@ -2,17 +2,17 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemMylistPlaylistVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemMylistPlaylistVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; public class VTMyListPlayAdapter @@ -38,7 +38,6 @@ public class VTMyListPlayAdapter Glide.with(mcontext) .load(data.getImage_url()) .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE)) .into(binding.ivMylistPlayItem); binding.tvMylistPlaylistName.setText(data.getName()); binding.tvMylistPlaylistEp.setText(String.format(mcontext.getString(R.string.mylist_playlist_process),data.getCurrent_episode(),data.getEpisode_total())); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTNineSquareAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTNineSquareAdapter.java similarity index 80% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTNineSquareAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTNineSquareAdapter.java index 336d1bf..f64190d 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTNineSquareAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTNineSquareAdapter.java @@ -2,16 +2,16 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemHotSquareVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemHotSquareVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; public class VTNineSquareAdapter @@ -36,7 +36,6 @@ public class VTNineSquareAdapter Glide.with(mcontext) .load(data.getImage_url()) .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE)) .into(binding.ivHotSquareItem); binding.tvHotSquareDesc.setText(data.getName()); } diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchDataAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchDataAdapter.java similarity index 90% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchDataAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchDataAdapter.java index 57f8e22..30ca6e4 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchDataAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchDataAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import android.view.View; @@ -10,8 +10,8 @@ import android.view.View; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.databinding.ItemSearchDataVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.databinding.ItemSearchDataVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; public class VTSearchDataAdapter @@ -54,7 +54,6 @@ public class VTSearchDataAdapter // Glide.with(mcontext) .load(data.getImage_url()) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) .into(binding.ivSearchDataItem); binding.tvSearchDatatitleItem.setText(data.getName()); binding.tvSearchDatadescItem.setText(data.getDescription()); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHotListAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchHotListAdapter.java similarity index 89% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHotListAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchHotListAdapter.java index f70e49f..69fb8e7 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTSearchHotListAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTSearchHotListAdapter.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import android.view.View; @@ -10,10 +10,10 @@ import android.view.View; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemSearchHotVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemSearchHotVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; public class VTSearchHotListAdapter @@ -43,7 +43,6 @@ public class VTSearchHotListAdapter // Glide.with(mcontext) .load(data.getImage_url()) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) .into(binding.ivHotSearchItem); binding.tvSearchHottitleItem.setText(data.getName()); binding.tvSearchHottotalItem.setText(TimeUtils.formatNumber(data.getWatch_total())); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabCommonAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabCommonAdapter.java similarity index 94% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabCommonAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabCommonAdapter.java index f180b60..11b9e66 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabCommonAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabCommonAdapter.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabItemListAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabItemListAdapter.java similarity index 83% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabItemListAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabItemListAdapter.java index feec94e..93686d1 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTTabItemListAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTTabItemListAdapter.java @@ -2,16 +2,16 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemHomeTablistVtBinding; -import com.jelly.zyreotv.app.model.ItemBean; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemHomeTablistVtBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; public class VTTabItemListAdapter @@ -40,7 +40,6 @@ public class VTTabItemListAdapter Glide.with(mcontext) .load(imageUrl) .placeholder(R.mipmap.ic_loadingdefault_hor) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) .into(binding.ivHometabItem); binding.tvHometabTitleItem.setText(data.getName()); binding.tvHometabContentItem.setText(data.getDescription()); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTUserVideoHistoryAdapter.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTUserVideoHistoryAdapter.java similarity index 82% rename from app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTUserVideoHistoryAdapter.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTUserVideoHistoryAdapter.java index 5d520f9..6423f7d 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/adapter/VTUserVideoHistoryAdapter.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/adapter/VTUserVideoHistoryAdapter.java @@ -2,17 +2,17 @@ // Use of this source code is governed by a MIT license that can be // found in the LICENSE file. -package com.jelly.zyreotv.app.ui.adapter; +package com.shortdrama.jelly.zyreotv.ui.adapter; import android.content.Context; import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.RequestOptions; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.ItemVideoHistoryBinding; -import com.jelly.zyreotv.app.model.ItemBean; -import com.jelly.zyreotv.app.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.ItemVideoHistoryBinding; +import com.shortdrama.jelly.zyreotv.model.ItemBean; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; public class VTUserVideoHistoryAdapter @@ -43,7 +43,6 @@ public class VTUserVideoHistoryAdapter Glide.with(mcontext) .load(data.getImage_url()) .placeholder(R.mipmap.ic_loadingdefault_ver) - .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE)) .into(binding.ivHistoryItem); binding.tvHistoryProgress.setText(TimeUtils.precess(data.getCurrent_episode(),data.getEpisode_total())+"%"); diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/view/ProgressLineView.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/ProgressLineView.java similarity index 95% rename from app/src/main/java/com/jelly/zyreotv/app/ui/view/ProgressLineView.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/ProgressLineView.java index d465c60..83e23e5 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/view/ProgressLineView.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/ProgressLineView.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.view; +package com.shortdrama.jelly.zyreotv.ui.view; import android.content.Context; import android.util.AttributeSet; @@ -12,7 +12,7 @@ import android.widget.FrameLayout; import androidx.annotation.Nullable; -import com.jelly.zyreotv.app.R; +import com.shortdrama.jelly.zyreotv.R; public class ProgressLineView extends FrameLayout { diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTBezierCircleHeader.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTBezierCircleHeader.java similarity index 99% rename from app/src/main/java/com/jelly/zyreotv/app/ui/view/VTBezierCircleHeader.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTBezierCircleHeader.java index e672c65..e2ec4ea 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTBezierCircleHeader.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTBezierCircleHeader.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.view; +package com.shortdrama.jelly.zyreotv.ui.view; import android.animation.ValueAnimator; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTGoogleExoPlayerView.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTGoogleExoPlayerView.java similarity index 96% rename from app/src/main/java/com/jelly/zyreotv/app/ui/view/VTGoogleExoPlayerView.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTGoogleExoPlayerView.java index caeb0ac..b8bb806 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTGoogleExoPlayerView.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTGoogleExoPlayerView.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.view; +package com.shortdrama.jelly.zyreotv.ui.view; import android.content.Context; import android.net.Uri; @@ -20,13 +20,13 @@ import androidx.media3.common.Player; import androidx.media3.exoplayer.ExoPlayer; import com.bumptech.glide.Glide; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.databinding.LayoutVideoplayVtBinding; -import com.jelly.zyreotv.app.model.VTVideoDetailsBean; -import com.jelly.zyreotv.app.utils.TimeUtils; -import com.jelly.zyreotv.app.utils.ToastUtils; -import com.jelly.zyreotv.app.utils.TranslatesUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.databinding.LayoutVideoplayVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoDetailsBean; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.utils.ToastUtils; +import com.shortdrama.jelly.zyreotv.utils.TranslatesUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTHomeGoogleExoPlayerView.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTHomeGoogleExoPlayerView.java similarity index 95% rename from app/src/main/java/com/jelly/zyreotv/app/ui/view/VTHomeGoogleExoPlayerView.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTHomeGoogleExoPlayerView.java index b8e4cf4..a70c193 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/ui/view/VTHomeGoogleExoPlayerView.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/ui/view/VTHomeGoogleExoPlayerView.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.ui.view; +package com.shortdrama.jelly.zyreotv.ui.view; import android.content.Context; import android.net.Uri; @@ -20,14 +20,14 @@ import androidx.media3.common.Player; import androidx.media3.exoplayer.ExoPlayer; import com.bumptech.glide.Glide; -import com.jelly.zyreotv.app.R; -import com.jelly.zyreotv.app.VTApplication; -import com.jelly.zyreotv.app.databinding.LayoutVideoplayHomeVtBinding; -import com.jelly.zyreotv.app.model.VTVideoExploreBean; -import com.jelly.zyreotv.app.utils.TimeUtils; -import com.jelly.zyreotv.app.utils.ToastUtils; -import com.jelly.zyreotv.app.utils.TranslatesUtils; -import com.jelly.zyreotv.app.utils.VTAppConstants; +import com.shortdrama.jelly.zyreotv.R; +import com.shortdrama.jelly.zyreotv.VTApplication; +import com.shortdrama.jelly.zyreotv.databinding.LayoutVideoplayHomeVtBinding; +import com.shortdrama.jelly.zyreotv.model.VTVideoExploreBean; +import com.shortdrama.jelly.zyreotv.utils.TimeUtils; +import com.shortdrama.jelly.zyreotv.utils.ToastUtils; +import com.shortdrama.jelly.zyreotv.utils.TranslatesUtils; +import com.shortdrama.jelly.zyreotv.utils.VTAppConstants; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/GetAndroidUniqueMark.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/GetAndroidUniqueMark.java similarity index 89% rename from app/src/main/java/com/jelly/zyreotv/app/utils/GetAndroidUniqueMark.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/GetAndroidUniqueMark.java index d182512..74b265c 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/GetAndroidUniqueMark.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/GetAndroidUniqueMark.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import android.annotation.SuppressLint; import android.content.Context; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/IntentUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/IntentUtils.java similarity index 78% rename from app/src/main/java/com/jelly/zyreotv/app/utils/IntentUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/IntentUtils.java index 290105c..754d617 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/IntentUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/IntentUtils.java @@ -1,11 +1,11 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import android.app.Activity; import android.content.Context; import android.content.Intent; -import com.jelly.zyreotv.app.ui.activity.play.VTVideoPlayerActivity; -import com.jelly.zyreotv.app.ui.activity.search.VTSearchActivity; +import com.shortdrama.jelly.zyreotv.ui.activity.play.VTVideoPlayerActivity; +import com.shortdrama.jelly.zyreotv.ui.activity.search.VTSearchActivity; public class IntentUtils { diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/SharePreferenceUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SharePreferenceUtils.java similarity index 96% rename from app/src/main/java/com/jelly/zyreotv/app/utils/SharePreferenceUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SharePreferenceUtils.java index 47f6f41..873f4eb 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/SharePreferenceUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SharePreferenceUtils.java @@ -1,6 +1,6 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; -import static com.jelly.zyreotv.app.VTApplication.AppContext; +import static com.shortdrama.jelly.zyreotv.VTApplication.AppContext; import android.app.Activity; import android.content.Context; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/SingleClickUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SingleClickUtils.java similarity index 92% rename from app/src/main/java/com/jelly/zyreotv/app/utils/SingleClickUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SingleClickUtils.java index da5f60b..f752360 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/SingleClickUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/SingleClickUtils.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import java.util.Date; import java.util.TimeZone; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/TimeUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TimeUtils.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/utils/TimeUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TimeUtils.java index 086477b..9bcb5ac 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/TimeUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import java.text.DecimalFormat; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/ToastUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/ToastUtils.java similarity index 89% rename from app/src/main/java/com/jelly/zyreotv/app/utils/ToastUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/ToastUtils.java index 3e89b14..b0309bf 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/ToastUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/ToastUtils.java @@ -1,9 +1,9 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import android.os.Handler; import android.os.Looper; import android.widget.Toast; -import com.jelly.zyreotv.app.VTApplication; +import com.shortdrama.jelly.zyreotv.VTApplication; public class ToastUtils { private static Toast toast; diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/TranslatesUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TranslatesUtils.java similarity index 88% rename from app/src/main/java/com/jelly/zyreotv/app/utils/TranslatesUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TranslatesUtils.java index 19dc4a5..66e74e5 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/TranslatesUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/TranslatesUtils.java @@ -1,6 +1,6 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; -import com.jelly.zyreotv.app.model.TranslatesResBean; +import com.shortdrama.jelly.zyreotv.model.TranslatesResBean; public class TranslatesUtils { diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/VTAppConstants.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTAppConstants.java similarity index 98% rename from app/src/main/java/com/jelly/zyreotv/app/utils/VTAppConstants.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTAppConstants.java index 381dd7a..590f268 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/VTAppConstants.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTAppConstants.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; public class VTAppConstants { diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/VTDecyrptUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTDecyrptUtils.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/utils/VTDecyrptUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTDecyrptUtils.java index a4f67f5..59cc036 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/VTDecyrptUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTDecyrptUtils.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; public class VTDecyrptUtils { diff --git a/app/src/main/java/com/jelly/zyreotv/app/utils/VTGsonUtils.java b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTGsonUtils.java similarity index 97% rename from app/src/main/java/com/jelly/zyreotv/app/utils/VTGsonUtils.java rename to app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTGsonUtils.java index c5bd57a..764c48e 100644 --- a/app/src/main/java/com/jelly/zyreotv/app/utils/VTGsonUtils.java +++ b/app/src/main/java/com/shortdrama/jelly/zyreotv/utils/VTGsonUtils.java @@ -1,4 +1,4 @@ -package com.jelly.zyreotv.app.utils; +package com.shortdrama.jelly.zyreotv.utils; import android.text.TextUtils; diff --git a/app/src/main/res/layout/activity_main_vt.xml b/app/src/main/res/layout/activity_main_vt.xml index 97d88ce..61f2982 100644 --- a/app/src/main/res/layout/activity_main_vt.xml +++ b/app/src/main/res/layout/activity_main_vt.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context="com.jelly.zyreotv.app.ui.activity.VTMainActivity"> + tools:context="com.shortdrama.jelly.zyreotv.ui.activity.VTMainActivity"> + tools:context="com.shortdrama.jelly.zyreotv.ui.activity.home.VTHomeFragment"> @@ -14,7 +14,7 @@ - + diff --git a/app/src/main/res/layout/fragment_main_vt.xml b/app/src/main/res/layout/fragment_main_vt.xml index fd3a7ea..bfeb7e8 100644 --- a/app/src/main/res/layout/fragment_main_vt.xml +++ b/app/src/main/res/layout/fragment_main_vt.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@mipmap/iv_homefragment_bg" - tools:context="com.jelly.zyreotv.app.ui.activity.home.VTHomeFragment"> + tools:context="com.shortdrama.jelly.zyreotv.ui.activity.home.VTHomeFragment"> + tools:context="com.shortdrama.jelly.zyreotv.ui.activity.home.VTHomeFragment"> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_google_home_player_vt.xml b/app/src/main/res/layout/item_google_home_player_vt.xml index 8126604..d7f4ef2 100644 --- a/app/src/main/res/layout/item_google_home_player_vt.xml +++ b/app/src/main/res/layout/item_google_home_player_vt.xml @@ -1,7 +1,7 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_player_controller_vt.xml b/app/src/main/res/layout/layout_player_controller_vt.xml index 77e7f5f..550afc7 100644 --- a/app/src/main/res/layout/layout_player_controller_vt.xml +++ b/app/src/main/res/layout/layout_player_controller_vt.xml @@ -122,7 +122,7 @@ android:thumb="@drawable/bg_shape_seekbar_player_vt" android:thumbOffset="8dp" /> - -