更新会员引导页面

app/build.gradle

@@ -44,7 +44,7 @@ android {
         }
 
         debug {
-            minifyEnabled false
+            minifyEnabled true
             signingConfig signingConfigs.signs
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
@@ -132,5 +132,7 @@ dependencies {
     implementation("com.google.firebase:firebase-analytics")
    // implementation("com.google.firebase:firebase-crashlytics")
     implementation("com.google.firebase:firebase-perf")
-    implementation("com.google.firebase:firebase-messaging:24.0.0")
+    implementation("com.google.firebase:firebase-messaging:24.1.1")
+  //  implementation "androidx.datastore:datastore-preferences:1.0.0"
+
 }

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/AExtractionActivity.java

@@ -633,7 +633,7 @@ public class AExtractionActivity extends IDDetailsRoundActivity<TManifestService
                                 if (isRequestNotify) {
                                     return;
                                 }
-                                w2aSelfAttribution(ddl);
+                               // w2aSelfAttribution(ddl);
                                 jumpDetails();
 
                             }

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/UBJPrivateOllowFragment.java

@@ -458,7 +458,7 @@ public class UBJPrivateOllowFragment extends Fragment {
     public void onResume() {
         super.onResume();
         seenMarkView.getUserInfo();
-        if (!TIndicator.is_Vip() && TimeUtils.vipPurchaseIsOpen() && vipPurchaseDialog == null) {
+//        if (!TIndicator.is_Vip() && TimeUtils.vipPurchaseIsOpen() && vipPurchaseDialog == null) {
             zytGooglePayUtils = ZYTGooglePayUtils.getInstance(getActivity(), purchase -> {
                   gsGooglePayInfo = new GSGooglePayInfo();
                 gsGooglePayInfo.setOrder_code(current_order_code);
@@ -499,8 +499,12 @@ public class UBJPrivateOllowFragment extends Fragment {
                     }
                 }
             });
+            zytGooglePayUtils.startConnection(connect -> {
+                isConnect = connect;
+                if(isConnect){
                     seenMarkView.getPaySetting(0, 0);
-            zytGooglePayUtils.startConnection(connect -> isConnect = connect);
+                }
+            });
             vipPurchaseDialog = new VipPurchaseDialog(getActivity());
             vipPurchaseDialog.setItemClickListener(new VipPurchaseDialog.onItemClickListener() {
                 @Override
@@ -519,7 +523,7 @@ public class UBJPrivateOllowFragment extends Fragment {
             });
             vipPurchaseDialog.show();
 
-        }
+       // }
     }
 
     private long dismissUniqueCookieCorePlay() {

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/ZYTStoreActivity.java

@@ -1,5 +1,6 @@
 package com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn;
 
+import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
 import android.os.Handler;
@@ -205,10 +206,13 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
+                            binding.layoutStoreRoot.tvStoreCoinsepisode.setVisibility(VISIBLE);
                             coinLargerAdapter.submitList(listCoins(list, "big"));
                             coinAdapter.submitList(listCoins(list, "small"));
                         }
                     });
+                }else{
+                    binding.layoutStoreRoot.tvStoreCoinsepisode.setVisibility(GONE);
                 }
             }
 
@@ -218,11 +222,14 @@ public class ZYTStoreActivity extends IDDetailsRoundActivity<ActivityStoreBindin
                     runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
+                            binding.layoutStoreRoot.tvStoreVip.setVisibility(VISIBLE);
                             subVipAdapter.submitList(list);
 
                         }
                     });
 
+                }else{
+                    binding.layoutStoreRoot.tvStoreVip.setVisibility(GONE);
                 }
             }
         });

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/CClickFragment.java

@@ -32,7 +32,7 @@ public class CClickFragment extends DialogFragment {
     }
 
     public interface EONCategory {
-        void chooseEpisodesSeries(LSQExampleCloseBean.YPZTestUnselect bean);
+        void chooseEpisodesSeries(LSQExampleCloseBean.YPZTestUnselect bean,int position);
     }
 
     private Map<String, List<LSQExampleCloseBean.YPZTestUnselect>> tabDataMap = new HashMap<>();
@@ -130,7 +130,7 @@ public class CClickFragment extends DialogFragment {
 //                        return;
 //                    }
 //                }
-                pageEpisodesSeriesCallBack.chooseEpisodesSeries(item);
+                pageEpisodesSeriesCallBack.chooseEpisodesSeries(item,position);
                 dismiss();
             });
         }

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTEpisodesRechargeDialogFragment.java

@@ -1,6 +1,8 @@
 package com.shortdrama.jelly.zyreotv.topics.abslRwgt.poolref;
 
 import static android.text.Html.FROM_HTML_MODE_LEGACY;
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -133,11 +135,14 @@ public class ZYTEpisodesRechargeDialogFragment extends DialogFragment {
                     requireActivity().runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
+                            dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setVisibility(VISIBLE);
                             coinAdapter.submitList(listCoins(list, "small"));
                             coinLargeAdapter.submitList(listCoins(list, "big"));
                         }
                     });
 
+                }else {
+                    dialogRechargeBinding.layoutStoreRecharge.tvStoreCoinsepisode.setVisibility(GONE);
                 }
             }
 
@@ -147,10 +152,13 @@ public class ZYTEpisodesRechargeDialogFragment extends DialogFragment {
                     requireActivity().runOnUiThread(new Runnable() {
                         @Override
                         public void run() {
+                            dialogRechargeBinding.layoutStoreRecharge.tvStoreVip.setVisibility(VISIBLE);
                             subVipAdapter.submitList(list);
                         }
                     });
 
+                }else{
+                    dialogRechargeBinding.layoutStoreRecharge.tvStoreVip.setVisibility(GONE);
                 }
             }
         });

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java

@@ -6,6 +6,7 @@ import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
 import static com.shortdrama.jelly.zyreotv.beginning.ITItem.CONSTANTS_UserWeb_Refresh_Event;
+import static com.shortdrama.jelly.zyreotv.beginning.ITItem.isCanPlay;
 
 import android.annotation.SuppressLint;
 import android.net.Uri;
@@ -172,7 +173,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
                         showLockView(item);
                     } else {
                         ITItem.isLock = false;
-                        ITItem.isCanPlay = true;
+                        isCanPlay = true;
                         viewBinding.viewLock.getRoot().setVisibility(View.INVISIBLE);
                         LSQExampleCloseBean.YPZTestUnselect currentItem = vtGooglePlayerAdapter.getItems().get(position);
                         if (currentItem != null) {
@@ -302,7 +303,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
 
     private void showLockView(LSQExampleCloseBean.YPZTestUnselect item) {
         ITItem.isLock = true;
-        ITItem.isCanPlay = false;
+        isCanPlay = false;
         viewBinding.viewLock.getRoot().setVisibility(View.VISIBLE);
         int allCoin = TIndicator.getAllCoin();
         if (currentPosition > 0) {
@@ -366,7 +367,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         vtViewModel.getDetailsRecommondLiveData().observe(this, it -> {
             if (it != null) {
                 if (it.data != null && it.data.getList() != null && !it.data.getList().isEmpty()) {
-                    ITItem.isCanPlay = false;
+                    isCanPlay = false;
                     viewBinding.viewVideoRecommend.getRoot().setVisibility(VISIBLE);
                     recommondVideoBannerAdapter = new ZYTRecommondVideoAdapter(it.data.getList());
                     recommondVideoBannerAdapter.setDatas(it.data.getList());
@@ -791,11 +792,17 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
         return false;
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        ITItem.isCanPlay = true;
+    }
 
     @Override
     public void onPause() {
         super.onPause();
         GPplicationLoadingdefault.isCurrentPage = false;
+        ITItem.isCanPlay = false;
         if (pageGoogleExoPlayerView() != null) pageGoogleExoPlayerView().suspendPlayer();
 
     }
@@ -829,7 +836,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
     protected void onDestroy() {
         getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         zytGooglePayUtils.clearInstance();
-        ITItem.isCanPlay = false;
+        isCanPlay = false;
         viewBinding.viewPagerVtEpisode.post(new Runnable() {
             @Override
             public void run() {
@@ -869,16 +876,26 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
     }
 
     @Override
-    public void chooseEpisodesSeries(LSQExampleCloseBean.YPZTestUnselect bean) {
+    public void chooseEpisodesSeries(LSQExampleCloseBean.YPZTestUnselect bean, int position) {
+
+
+        if (position != 0) {
+            if (bean.isIs_lock() && vtGooglePlayerAdapter.getItem(position - 1).isIs_lock()) {
+                PAYLoginHeaddefault.revealToast(getString(R.string.unlock_episode_series_error), 0);
+                return;
+            }
+        }
         ITItem.isLock = bean.isIs_lock();
+        viewBinding.viewPagerVtEpisode.setCurrentItem(bean.getEpisode() - 1);
+
 //        if (pageGoogleExoPlayerView() != null) {
 //            pageGoogleExoPlayerView().suspendPlayer();
 //        }
-        LogUtils.d("chooseEpisodesSeries  " + (bean.getEpisode() - 1) + "   " + currentPosition);
+//        LogUtils.d("chooseEpisodesSeries  " + (bean.getEpisode() - 1) + "   " + currentPosition);
-        if ((bean.getEpisode() - 1) == currentPosition && bean.isIs_lock()) {
+//        if ((bean.getEpisode() - 1) == currentPosition && bean.isIs_lock()) {
-            showLockView(bean);
+//            showLockView(bean);
-        }
+//        }
-        viewBinding.viewPagerVtEpisode.setCurrentItem(bean.getEpisode() - 1);
+//        viewBinding.viewPagerVtEpisode.setCurrentItem(bean.getEpisode() - 1);
 
 
     }

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/pragma/VipPurchaseDialog.java

@@ -1,6 +1,7 @@
 package com.shortdrama.jelly.zyreotv.topics.abslRwgt.pragma;
 
 import static android.text.Html.FROM_HTML_MODE_LEGACY;
+import static android.view.Gravity.CENTER;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -24,6 +25,7 @@ import com.shortdrama.jelly.zyreotv.databinding.DialogVipPurchaseBinding;
 import com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn.GXCProgressLogin;
 import com.shortdrama.jelly.zyreotv.topics.abslRwgt.decbn.ZYTStoreActivity;
 import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreSubVipAdapter;
+import com.shortdrama.jelly.zyreotv.topics.dts.ZYTStoreSubVipMyAdapter;
 import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean;
 import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean;
 
@@ -34,7 +36,7 @@ import java.util.List;
 public class VipPurchaseDialog extends Dialog {
     DialogVipPurchaseBinding binding;
 
-    private ZYTStoreSubVipAdapter subVipAdapter;
+    private ZYTStoreSubVipMyAdapter subVipAdapter;
 
     private List<ZYTPaySettingBean.Vip> list;
 
@@ -74,18 +76,19 @@ public class VipPurchaseDialog extends Dialog {
             binding.tvDialogVippurchaseTitle.setText(Html.fromHtml(translates.getGleestream_vippurchase_dialog(),
                     FROM_HTML_MODE_LEGACY));
             binding.tvDialogVippurchaseTitle2.setText(translates.getGleestream_vippurchase_dialog_unlock());
-            binding.tvDialogVippurchaseAdfree.setText(translates.getGleestream_vip_benefits_adfree());
+//            binding.tvDialogVippurchaseAdfree.setText(translates.getGleestream_vip_benefits_adfree());
-            binding.tvDialogVippurchaseExclusive.setText(translates.getGleestream_vip_benefits_exclusive());
+//            binding.tvDialogVippurchaseExclusive.setText(translates.getGleestream_vip_benefits_exclusive());
-            binding.tvDialogVippurchaseDailyfree.setText(translates.getGleestream_vip_benefits_dailyfree());
+//            binding.tvDialogVippurchaseDailyfree.setText(translates.getGleestream_vip_benefits_dailyfree());
-            binding.tvDialogVippurchaseMembership.setText(translates.getGleestream_membership_recharge());
+//            binding.tvDialogVippurchaseMembership.setText(translates.getGleestream_membership_recharge());
         }
 
-        subVipAdapter = new ZYTStoreSubVipAdapter();
+        subVipAdapter = new ZYTStoreSubVipMyAdapter();
-        binding.recyclerviewDialogVippurchase.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.HORIZONTAL, false));
+        binding.recyclerviewDialogVippurchase.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
         binding.recyclerviewDialogVippurchase.setAdapter(subVipAdapter);
         subVipAdapter.submitList(list);
         subVipAdapter.setOnItemClickListener((baseQuickAdapter, view, i) -> {
             if (itemClickListener != null) {
+                subVipAdapter.setCurrentPosition(i);
                 itemClickListener.onSubvipItem(subVipAdapter.getItem(i));
             }
         });
@@ -96,7 +99,8 @@ public class VipPurchaseDialog extends Dialog {
         Window window = getWindow();
         WindowManager.LayoutParams wlp = window.getAttributes();
         wlp.width = WindowManager.LayoutParams.MATCH_PARENT;
-        wlp.height = WindowManager.LayoutParams.MATCH_PARENT;
+        wlp.gravity = Gravity.CENTER;
+        wlp.height = WindowManager.LayoutParams.WRAP_CONTENT;
         window.setAttributes(wlp);
 
     }

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/dts/ZYTStoreSubVipMyAdapter.java

@@ -0,0 +1,157 @@
+package com.shortdrama.jelly.zyreotv.topics.dts;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Shader;
+import android.text.TextPaint;
+import android.view.ViewGroup;
+
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.chad.library.adapter4.BaseQuickAdapter;
+import com.chad.library.adapter4.viewholder.QuickViewHolder;
+import com.shortdrama.jelly.zyreotv.R;
+import com.shortdrama.jelly.zyreotv.beginning.AppUtils;
+import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.GSTranslatesBean;
+import com.shortdrama.jelly.zyreotv.unconfirmedPiecewise.ZYTPaySettingBean;
+
+
+public class ZYTStoreSubVipMyAdapter extends BaseQuickAdapter<ZYTPaySettingBean.Vip, QuickViewHolder> {
+
+
+    private int currentPosition = -1;
+
+
+    public void setCurrentPosition(int currentPosition) {
+        this.currentPosition = currentPosition;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    protected void onBindViewHolder(QuickViewHolder holder, int position, ZYTPaySettingBean.Vip item) {
+
+
+        AppCompatImageView imageViewType = holder.getView(R.id.iv_vip_type);
+        AppCompatTextView tvTitle = holder.getView(R.id.tv_membership_title);
+        AppCompatTextView tvCurrency = holder.getView(R.id.tv_membership_pricetype);
+        AppCompatTextView tvPrice = holder.getView(R.id.tv_membership_price);
+        AppCompatTextView tvVipType = holder.getView(R.id.tv_membership_viptype);
+        AppCompatImageView ivselected = holder.getView(R.id.iv_selected);
+        String viptype = item.getVip_type_key();
+        if (viptype.equals("year")) {
+            tvTitle.setTextColor(Color.parseColor("#00438D"));
+            tvCurrency.setTextColor(Color.parseColor("#00438D"));
+            tvPrice.setTextColor(Color.parseColor("#00438D"));
+            tvVipType.setTextColor(Color.parseColor("#00438D"));
+            imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_year);
+        }
+        if (viptype.equals("quarter")) {
+            tvTitle.setTextColor(Color.parseColor("#221C80"));
+            tvCurrency.setTextColor(Color.parseColor("#221C80"));
+            tvPrice.setTextColor(Color.parseColor("#221C80"));
+            tvVipType.setTextColor(Color.parseColor("#221C80"));
+            imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_quarter);
+        }
+        if (viptype.equals("week")) {
+            tvTitle.setTextColor(Color.parseColor("#71412B"));
+            tvCurrency.setTextColor(Color.parseColor("#71412B"));
+            tvPrice.setTextColor(Color.parseColor("#71412B"));
+            tvVipType.setTextColor(Color.parseColor("#71412B"));
+            imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_week);
+        }
+        if (viptype.equals("month")) {
+            tvTitle.setTextColor(Color.parseColor("#68003B"));
+            tvCurrency.setTextColor(Color.parseColor("#68003B"));
+            tvPrice.setTextColor(Color.parseColor("#68003B"));
+            tvVipType.setTextColor(Color.parseColor("#68003B"));
+            imageViewType.setBackgroundResource(R.mipmap.ic_vippurchase_mybg_month);
+        }
+//        if (position == 0) {
+//            constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_month);
+//            tvTitle.setTextColor(Color.parseColor("#68003B"));
+//            tvCurrency.setTextColor(Color.parseColor("#68003B"));
+//            tvPrice.setTextColor(Color.parseColor("#68003B"));
+//            tvVipType.setTextColor(Color.parseColor("#68003B"));
+//            tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_one_14dp);
+//        }
+//        if (position == 1) {
+//            constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_week);
+//            tvTitle.setTextColor(Color.parseColor("#71412B"));
+//            tvCurrency.setTextColor(Color.parseColor("#71412B"));
+//            tvPrice.setTextColor(Color.parseColor("#71412B"));
+//            tvVipType.setTextColor(Color.parseColor("#71412B"));
+//            tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_two_14dp);
+//        }
+//        if (position == 2) {
+//            constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_quarter);
+//            tvTitle.setTextColor(Color.parseColor("#221C80"));
+//            tvCurrency.setTextColor(Color.parseColor("#221C80"));
+//            tvPrice.setTextColor(Color.parseColor("#221C80"));
+//            tvVipType.setTextColor(Color.parseColor("#221C80"));
+//            tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_three_14dp);
+//        }
+//        if (position == 3) {
+//            constraintLayout.setBackgroundResource(R.mipmap.ic_vippurchase_bg_year);
+//            tvTitle.setTextColor(Color.parseColor("#00438D"));
+//            tvCurrency.setTextColor(Color.parseColor("#00438D"));
+//            tvPrice.setTextColor(Color.parseColor("#00438D"));
+//            tvVipType.setTextColor(Color.parseColor("#00438D"));
+//            tvDesc.setBackgroundResource(R.drawable.cornor_vippurchase_four_14dp);
+//        }
+
+        if (currentPosition == position) {
+            ivselected.setVisibility(VISIBLE);
+        } else {
+            ivselected.setVisibility(GONE);
+        }
+        tvTitle.setText(item.getBrief() + "");
+        tvCurrency.setText(item.getCurrency() + "");
+        tvPrice.setText(item.getPrice() + "");
+        tvVipType.setText("/" + item.getShort_type() + "");
+
+
+    }
+
+    @Override
+    public QuickViewHolder onCreateViewHolder(Context context, ViewGroup parent, int viewType) {
+        return new QuickViewHolder(R.layout.item_store_subviplist_my_zyt, parent);
+    }
+
+
+    private void applyGradient(AppCompatTextView textView, String startColor, String endColor) {
+        int width = textView.getWidth();
+        int height =  textView.getHeight();
+        if (width == 0) width = textView.getMeasuredWidth(); // 防止为 0
+        TextPaint textPaint = textView.getPaint();
+        // 设置线性渐变
+        Shader shader = new LinearGradient(
+                0, 0, width, textView.getHeight(), // 斜向渐变  （水平渐变 高度为0）
+                new int[]{Color.parseColor(startColor), Color.parseColor(endColor)},
+                null,
+                Shader.TileMode.CLAMP
+        );
+        textPaint.setShader(shader);
+        textPaint.setStyle(Paint.Style.FILL);
+        textView.invalidate(); // 刷新视图
+//        Shader shader = new RadialGradient(
+//                width/2f,
+//                height/2f,
+//                Math.max(width, height) / 2f,
+//                new int[]{Color.parseColor(startColor), Color.parseColor(endColor)},
+//                new float[]{0f, 1f},
+//                Shader.TileMode.CLAMP);
+//        textPaint.setShader(shader);
+//        textPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
+//       // textPaint.setStyle(Paint.Style.FILL);
+//        textView.invalidate(); // 刷新视图
+
+    }
+
+}

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

@@ -14,19 +14,15 @@
         android:layout_alignParentTop="true"
         android:layout_marginTop="@dimen/margintoptitle" />
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/layout_store_actionbar"
-        android:scrollbars="none">
 
     <include
         android:id="@+id/layout_store_root"
         layout="@layout/layout_store"
         android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/layout_store_actionbar"
         android:layout_marginBottom="@dimen/clickOdyload" />
-    </androidx.core.widget.NestedScrollView>
+
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/loading"

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

@@ -246,9 +246,7 @@
                 android:id="@+id/recyclerview_my_vip"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/followHistoryOllow"
                 android:layout_marginTop="@dimen/rechargeGradient"
-                android:layout_marginEnd="@dimen/followHistoryOllow"
                 app:layout_constraintTop_toBottomOf="@+id/tv_vip_recharge" />
 
             <include

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

@@ -2,23 +2,29 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
-    android:background="#b3000000"
     android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_conent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
+        android:layout_marginStart="@dimen/settingsHeaderGoogle"
-        android:layout_marginEnd="30dp"
+        android:layout_marginEnd="@dimen/settingsHeaderGoogle"
-        android:background="@mipmap/ic_dialog_vippurchase_bg"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_vip_bg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="@+id/recyclerview_dialog_vippurchase"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="@dimen/agreementLock"
+            app:srcCompat="@mipmap/ic_dialog_vippurchase_bg" />
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline"
@@ -31,10 +37,11 @@
             android:id="@+id/iv_dialog_vippurchase_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingStart="20dp"
+            android:layout_marginTop="@dimen/settingsHeaderGoogle"
-            android:paddingTop="15dp"
+            android:paddingStart="@dimen/clickOdyload"
-            android:paddingEnd="20dp"
+            android:paddingTop="@dimen/clickOdyload"
-            android:paddingBottom="15dp"
+            android:paddingEnd="@dimen/clickOdyload"
+            android:paddingBottom="@dimen/followHistoryOllow"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@mipmap/ic_dialog_vippurchase_close" />
@@ -44,8 +51,8 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginStart="23dp"
+            android:layout_marginStart="@dimen/headerSelectGradle"
-            android:layout_marginTop="14dp"
+            android:layout_marginTop="@dimen/rewardsPlash"
             android:text="Go Premium \nElevate Your Binge!"
             android:textColor="#712B2B"
             android:textSize="18sp"
@@ -58,82 +65,25 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="@dimen/aboutAbout"
             android:text="Unlock 1000+ exclusive dramas"
             android:textColor="#AB7B7B"
             android:textSize="13sp"
             app:layout_constraintStart_toStartOf="@+id/tv_dialog_vippurchase_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_title" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_dialog_vippurchase_adfree"
-            android:layout_width="57dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:drawableTop="@mipmap/ic_dialog_vippurchase_noads"
-            android:gravity="center"
-            android:text="Ad-Free\nStreaming"
-            android:textColor="#712B2B"
-            android:textSize="10sp"
-            app:layout_constraintStart_toStartOf="@+id/tv_dialog_vippurchase_title2"
-            app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_title2" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_dialog_vippurchase_exclusive"
-            android:layout_width="57dp"
-            android:layout_height="wrap_content"
-            android:drawableTop="@mipmap/ic_dialog_vippurchase_exclusive_episodes"
-            android:gravity="center"
-            android:text="Exclusive Episodes"
-            android:textColor="#712B2B"
-            android:textSize="10sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_dialog_vippurchase_adfree" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_dialog_vippurchase_dailyfree"
-            android:layout_width="57dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="23dp"
-            android:drawableTop="@mipmap/ic_dialog_vippurchase_dailyfree"
-            android:gravity="center"
-            android:text="Daily free coins"
-            android:textColor="#712B2B"
-            android:textSize="10sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_dialog_vippurchase_adfree" />
-
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/tv_dialog_vippurchase_membership"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:layout_marginEnd="23dp"
-            android:drawableStart="@mipmap/ic_vip_left"
-            android:drawableEnd="@mipmap/ic_vip_right"
-            android:drawablePadding="10dp"
-            android:gravity="center"
-            android:text="Membership Recharge"
-            android:textColor="#BF6BFF"
-            android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_adfree" />
-
-
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerview_dialog_vippurchase"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginStart="9dp"
-            android:layout_marginBottom="15dp"
+            android:layout_marginTop="@dimen/ffffffSelector"
-            android:minHeight="100dp"
+            android:layout_marginEnd="2dp"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_membership" />
+            app:layout_constraintBottom_toBottomOf="@+id/iv_vip_bg"
+            app:layout_constraintTop_toBottomOf="@+id/tv_dialog_vippurchase_title2" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/iv_dialog_vippurchase_unclock"
@@ -165,8 +115,8 @@
         android:id="@+id/iv_dialog_vippurchase_top"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="-20dp"
         app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/clickOdyload"
         app:layout_constraintTop_toTopOf="@+id/layout_conent"
         app:srcCompat="@mipmap/ic_dialog_vippurchase_top" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -9,8 +9,8 @@
 
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="@dimen/nineLauncherList"
+        android:layout_width="@dimen/colorsAbout"
-        android:layout_height="@dimen/nineLauncherList"
+        android:layout_height="@dimen/colorsAbout"
         android:layout_marginTop="@dimen/plashBannerOdyload"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_membership_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/agreementLock"
+    android:layout_marginStart="@dimen/private_gqTabindicator"
+    android:layout_marginEnd="@dimen/followHistoryOllow">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_vip_type"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:scaleType="centerCrop"
+        android:background="@mipmap/ic_vippurchase_mybg_month"
+        app:layout_constraintDimensionRatio="220:65"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/iv_selected"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/tablistBackGoogle"
+        android:visibility="visible"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:srcCompat="@mipmap/ic_vip_selector_my" />
+
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_membership_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/private_gqTabindicator"
+        android:text="@string/vip_weekly_membership_txt"
+        android:textSize="11sp"
+        android:textStyle="bold"
+        android:layout_marginStart="@dimen/followHistoryOllow"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_membership_pricetype"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/color_e6ffffff"
+        android:textSize="@dimen/stringsRechargeSeekbar"
+        android:text="dddddd"
+        android:layout_marginStart="@dimen/followHistoryOllow"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_membership_price"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_membership_price" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_membership_price"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:textSize="@dimen/commonAdapterAppname"
+        android:textStyle="bold"
+        android:text="dddddd"
+        android:layout_marginTop="@dimen/squareDefault_q"
+        app:layout_constraintStart_toEndOf="@+id/tv_membership_pricetype"
+        app:layout_constraintTop_toBottomOf="@+id/tv_membership_title" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_membership_viptype"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/stringsRechargeSeekbar"
+        android:text="/ddd"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_membership_price"
+        app:layout_constraintStart_toEndOf="@+id/tv_membership_price"
+        app:layout_constraintTop_toTopOf="@+id/tv_membership_price" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
+
+

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

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="match_parent">
 
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <RelativeLayout
+        <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
+            android:orientation="vertical"
             android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -48,13 +49,14 @@
                 android:layout_alignParentEnd="true"
                 android:layout_marginEnd="@dimen/followHistoryOllow"
                 android:textColor="@color/color_e6ffffff"
+                android:visibility="gone"
                 android:textSize="@dimen/fragmentTabindicator" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerview_store_large"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/tv_store_coinsvalue"
+                android:layout_below="@+id/tv_store_coinsepisode"
                 android:layout_marginStart="@dimen/followHistoryOllow"
                 android:layout_marginTop="@dimen/earchLayout"
                 android:layout_marginEnd="@dimen/cateSplash" />
@@ -79,6 +81,6 @@
                 android:layout_marginEnd="@dimen/followHistoryOllow" />
 
 
-        </RelativeLayout>
+        </androidx.appcompat.widget.LinearLayoutCompat>
     </androidx.core.widget.NestedScrollView>
 </RelativeLayout>

gradle.properties

@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.enableJetifier=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
@@ -23,6 +24,6 @@ android.nonTransitiveRClass=true
 #org.gradle.internal.http.socketTimeout=600000
 # uploadCrashlyticsMappingFile
 systemProp.http.proxyHost=127.0.0.1
-systemProp.http.proxyPort=10809
+systemProp.http.proxyPort=26001
 systemProp.https.proxyHost=127.0.0.1
-systemProp.https.proxyPort=10809
+systemProp.https.proxyPort=26001